aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWilmer van der Gaast <wilmer@google.com>2010-08-18 11:01:10 +0100
committerWilmer van der Gaast <wilmer@google.com>2010-08-18 11:01:10 +0100
commit763a3abb5a255fc22169c3fd86aabb7020e21086 (patch)
tree36f9a6deed3d3fdfe6b23ae162ec30d9a01bc327
parent57782e4ade94ee1e3a426f18b5e7ad9a9320fca2 (diff)
Pass the -Npackage flag the right way so bitlbee-libpurple doesn't appear
in debian/files. The previous hack broke genchanges/debsign.
-rwxr-xr-xdebian/rules14
1 files changed, 7 insertions, 7 deletions
diff --git a/debian/rules b/debian/rules
index 0b8a4dd6..c5397085 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,6 +17,10 @@ ifndef BITLBEE_VERSION
BITLBEE_CONFIGURE_VERSION ?= BITLBEE_VERSION=\"$(shell dpkg-parsechangelog | grep ^Version: | awk '{print $$2}')\"
endif
+ifneq ($(BITLBEE_LIBPURPLE),1)
+DH_OPTIONS += -Nbitlbee-libpurple
+endif
+
build: build-stamp
build-stamp:
dh_testdir
@@ -90,20 +94,16 @@ else
dh_gencontrol -- -Vbee:Version=$(shell dpkg-parsechangelog | grep ^Version: | awk '{print $$2}' | sed -e 's/+b[0-9]\+$$//')
endif
dh_md5sums
-ifeq ($(BITLBEE_LIBPURPLE),1)
dh_builddeb
-else
- dh_builddeb -Nbitlbee-libpurple
-endif
binary-indep: build install
- $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
+ DH_OPTIONS=-i $(MAKE) -f debian/rules binary-common
binary-arch: build install
- $(MAKE) -f debian/rules DH_OPTIONS=-a binary-common
+ DH_OPTIONS=-a $(MAKE) -f debian/rules binary-common
binary-%: build install
- make -f debian/rules binary-common DH_OPTIONS=-p$*
+ DH_OPTIONS=-p$* $(MAKE) -f debian/rules binary-common
binary: binary-indep binary-arch
.PHONY: build clean binary-indep binary-arch binary-common binary install