Changeset 4022b68 for debian/rules

Timestamp:

2010-08-21T22:42:01Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

fd424c8

Parents:

327af51 (diff), c00dd71 (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 mainline.

File:

• debian/rules (modified) (8 diffs)

debian/rules

@@ -8 +8 @@
 #
 
+# Include the bitlbee-libpurple variant by default
+BITLBEE_LIBPURPLE ?= 1
 BITLBEE_CONFIGURE_FLAGS ?=
 DEBUG ?= 0
@@ -14 +16 @@
 # Want to use the full package version number instead of just the release.
 BITLBEE_CONFIGURE_VERSION ?= BITLBEE_VERSION=\"$(shell dpkg-parsechangelog | grep ^Version: | awk '{print $$2}')\"
+endif
+
+ifneq ($(BITLBEE_LIBPURPLE),1)
+DH_OPTIONS += -Nbitlbee-libpurple
 endif
 
@@ -24 +30 @@
         $(MAKE) -C debian/build-native
 
+ifeq ($(BITLBEE_LIBPURPLE),1)
         mkdir -p debian/build-libpurple
         ROOT=$$PWD; cd debian/build-libpurple; $(BITLBEE_CONFIGURE_VERSION) $$ROOT/configure --debug=$(DEBUG) --prefix=/usr --etcdir=/etc/bitlbee --purple=1 $(BITLBEE_CONFIGURE_FLAGS)
         $(MAKE) -C debian/build-libpurple
+endif
 
         $(MAKE) -C doc
@@ -37 +45 @@
         rm -f build-stamp
 
-        rm -rf build-arch-stamp debian/build-*
+        rm -rf build-arch-stamp debian/build-* debian/bitlbee-libpurple.prerm
         $(MAKE) distclean
 
@@ -48 +56 @@
         dh_installdirs
 
-        $(MAKE) -C debian/build-native install install-etc DESTDIR=`pwd`/debian/bitlbee
-        $(MAKE) -C debian/build-libpurple install install-etc DESTDIR=`pwd`/debian/bitlbee-libpurple
+        $(MAKE) -C debian/build-native install DESTDIR=`pwd`/debian/bitlbee
+        $(MAKE) -C debian/build-native install-etc DESTDIR=`pwd`/debian/bitlbee-common
         $(MAKE) -C debian/build-native install-dev DESTDIR=`pwd`/debian/bitlbee-dev
+        patch debian/bitlbee-common/etc/bitlbee/bitlbee.conf debian/patches/bitlbee.conf.diff
 
-        patch debian/bitlbee/etc/bitlbee/bitlbee.conf debian/patches/bitlbee.conf.diff
-        patch debian/bitlbee-libpurple/etc/bitlbee/bitlbee.conf debian/patches/bitlbee.conf.diff
+ifeq ($(BITLBEE_LIBPURPLE),1)
+        $(MAKE) -C debian/build-libpurple install DESTDIR=`pwd`/debian/bitlbee-libpurple
+        ln -sf debian/bitlbee.prerm debian/bitlbee-libpurple.prerm
+endif
 
         mkdir -p debian/bitlbee-common/usr
@@ -68 +79 @@
         # TODO: Restore --link-doc up here and remove the hack below once
         # Hardy and Lenny are deprecated.
-        for p in bitlbee bitlbee-libpurple bitlbee-dev; do rm -rf debian/$$p/usr/share/doc/$$p; ln -s bitlbee-common debian/$$p/usr/share/doc/$$p; done
+        for p in bitlbee bitlbee-libpurple bitlbee-dev; do rm -r debian/$$p/usr/share/doc/$$p && ln -s bitlbee-common debian/$$p/usr/share/doc/$$p; done
         dh_installdebconf
-        dh_installinit
-ifeq ($(DH_OPTIONS),-a)
-        cp -a debian/bitlbee/etc debian/bitlbee-libpurple
-endif
+        dh_installinit --init-script=bitlbee
         dh_installman
         dh_strip
@@ -80 +88 @@
         dh_fixperms
         dh_installdeb
-ifeq ($(DH_OPTIONS),-a)
-        cp -a debian/bitlbee/DEBIAN/post* debian/bitlbee/DEBIAN/pre* debian/bitlbee-libpurple/DEBIAN
-endif
         dh_shlibdeps
 ifdef BITLBEE_VERSION
@@ -93 +98 @@
 
 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