Changeset f329dfc for debian


Ignore:
Timestamp:
2014-10-05T20:33:51Z (10 years ago)
Author:
Wilmer van der Gaast <wilmer@…>
Branches:
master
Children:
168d3bb
Parents:
e252d8c (diff), e01ff50 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge from Jelmer to fix builds on all recent Deb/Ubuntu versions again.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • debian/rules

    re252d8c rf329dfc  
    3434endif
    3535
     36CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS)
     37CFLAGS:=$(shell dpkg-buildflags --get CFLAGS)
     38LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
     39
     40CONFIGURE_OVERRIDES:=CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)"
     41
    3642build: build-stamp
    3743build-stamp:
     
    3945
    4046        mkdir -p debian/build-native
    41         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)
     47        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)
    4248        $(MAKE) -C debian/build-native
    4349
    4450ifeq ($(BITLBEE_LIBPURPLE),1)
    4551        mkdir -p debian/build-libpurple
    46         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)
     52        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)
    4753        $(MAKE) -C debian/build-libpurple
    4854endif
Note: See TracChangeset for help on using the changeset viewer.