[Pkg-wmaker-commits] [wmfrog] 83/145: debian/rules: remove debian/debian-vars.mk

[Doug Torrance]

This is an automated email from the git hooks/post-receive script.

dtorrance-guest pushed a commit to branch master
in repository wmfrog.

commit 32bff7276bf156e269d9446e6619209da4ed0915
Author: Jari Aalto <jari.aalto at cante.net>
Date:   Wed Mar 21 03:45:35 2012 -0400

    debian/rules: remove debian/debian-vars.mk
---
 debian/rules | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/debian/rules b/debian/rules
index 9990071..0ebe001 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,11 +4,9 @@ PACKAGE = wmfrog
 MAKEOPT = -C Src
 
 export DEB_BUILD_MAINT_OPTIONS	= hardening=+all
-CFLAGS	+= -Wall -pedantic
+CFLAGS	+= -Wall -pedantic $(CPPFLAGS)
 LDFLAGS += -Wl,--as-needed
 
-include debian/debian-vars.mk
-
 man:
 	# convert *.pod to manual page
 	$(MAKE) -C debian -f pod2man.mk PACKAGE=$(PACKAGE) makeman
@@ -22,9 +20,9 @@ override_dh_auto_clean:
 override_dh_auto_install:
 	$(MAKE) $(MAKEOPT) install DESTDIR=$(CURDIR)/debian/wmfrog
 
-.PHONY = man
-
 %:
 	dh $@
 
+.PHONY = man
+
 # End of file

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmfrog.git