Changeset 17cc2fe for debian/rules

Timestamp:

2018-05-27T03:04:01Z (6 years ago)

Author:

dequis <dx@…>

Branches:

master

Children:

49ab3cb

Parents:

5c163e5 (diff), f8d2cff (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 branch 'develop'

File:

• debian/rules (modified) (5 diffs)

debian/rules

@@ -35 +35 @@
 HAS_DH_SYSTEMD:=$(shell dpkg-query -W -f='$${Status}' dh-systemd 2>/dev/null | grep -c "ok installed")
 
-# No difference at the build stage so just call main build target.
-# (Well indep could be docs-only but we prebuild them plus it's really
-# not that much work.)
-build-arch build-indep: build
+build-arch: build
 
 build: build-stamp
@@ -45 +42 @@
 
         mkdir -p debian/build-native
-        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) --systemdsystemunitdir=/lib/systemd/system $(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) --systemdsystemunitdir=/lib/systemd/system --pcdir=/usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig $(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) $(CONFIGURE_OVERRIDES) $$ROOT/configure --debug=$(DEBUG) --prefix=/usr --etcdir=/etc/bitlbee --systemdsystemunitdir=/lib/systemd/system --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 --systemdsystemunitdir=/lib/systemd/system --pcdir=/usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig --purple=1 $(BITLBEE_CONFIGURE_FLAGS)
         $(MAKE) -C debian/build-libpurple
 endif
@@ -98 +95 @@
         dh_installchangelogs doc/CHANGES
         dh_installexamples
-        dh_installdocs #--link-doc=bitlbee-common
-        # 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 bitlbee-plugin-otr; do rm -r debian/$$p/usr/share/doc/$$p && ln -s bitlbee-common debian/$$p/usr/share/doc/$$p || true; done
+        dh_installdocs --link-doc=bitlbee-common
         dh_installdebconf
 ifeq ($(HAS_DH_SYSTEMD),1)
@@ -123 +117 @@
         dh_builddeb
 
-binary-indep: build install
-        DH_OPTIONS=-i $(MAKE) -f debian/rules binary-common
-
 binary-arch: build install
         DH_OPTIONS=-a $(MAKE) -f debian/rules binary-common
@@ -132 +123 @@
         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
+binary: binary-arch
+.PHONY: build clean binary-arch binary-common binary install