diff options
author | Wilmer van der Gaast <wilmer@gaast.net> | 2014-10-05 21:33:51 +0100 |
---|---|---|
committer | Wilmer van der Gaast <wilmer@gaast.net> | 2014-10-05 21:33:51 +0100 |
commit | f329dfc7baea7e1edc1c664fad70ee0415c2330b (patch) | |
tree | e35a268fcba1515a742b1a1ec757b1ff016d102e | |
parent | e252d8cab06e038e5801652bedf02de9170c7945 (diff) | |
parent | e01ff50356308058948fe5c21126a8f08f76f407 (diff) |
Merge from Jelmer to fix builds on all recent Deb/Ubuntu versions again.
-rwxr-xr-x | debian/rules | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/debian/rules b/debian/rules index a4c8c1f3..e0ffb898 100755 --- a/debian/rules +++ b/debian/rules @@ -33,17 +33,23 @@ ifneq ($(BITLBEE_SKYPE),plugin) DH_OPTIONS += -Nbitlbee-plugin-skype -Nskyped endif +CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS) +CFLAGS:=$(shell dpkg-buildflags --get CFLAGS) +LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS) + +CONFIGURE_OVERRIDES:=CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" + build: build-stamp build-stamp: dh_testdir mkdir -p debian/build-native - ROOT=$$PWD; cd debian/build-native; $(BITLBEE_CONFIGURE_VERSION) $(shell dpkg-buildflags --export=configure) $$ROOT/configure --debug=$(DEBUG) --prefix=/usr --etcdir=/etc/bitlbee --events=libevent --otr=$(BITLBEE_OTR) --skype=$(BITLBEE_SKYPE) $(BITLBEE_CONFIGURE_FLAGS) + ROOT=$$PWD; cd debian/build-native; $(BITLBEE_CONFIGURE_VERSION) $(CONFIGURE_OVERRIDES) $$ROOT/configure --debug=$(DEBUG) --prefix=/usr --etcdir=/etc/bitlbee --events=libevent --otr=$(BITLBEE_OTR) --skype=$(BITLBEE_SKYPE) $(BITLBEE_CONFIGURE_FLAGS) $(MAKE) -C debian/build-native ifeq ($(BITLBEE_LIBPURPLE),1) mkdir -p debian/build-libpurple - ROOT=$$PWD; cd debian/build-libpurple; $(BITLBEE_CONFIGURE_VERSION) $(shell dpkg-buildflags --export=configure) $$ROOT/configure --debug=$(DEBUG) --prefix=/usr --etcdir=/etc/bitlbee --purple=1 $(BITLBEE_CONFIGURE_FLAGS) + ROOT=$$PWD; cd debian/build-libpurple; $(BITLBEE_CONFIGURE_VERSION) $(CONFIGURE_OVERRIDES) $$ROOT/configure --debug=$(DEBUG) --prefix=/usr --etcdir=/etc/bitlbee --purple=1 $(BITLBEE_CONFIGURE_FLAGS) $(MAKE) -C debian/build-libpurple endif |