[Pkg-electronics-commits] [pcb] 01/03: We can now build arch-dependent and arch-independent packages only

[Dima Kogan]

This is an automated email from the git hooks/post-receive script.

dkogan pushed a commit to branch master
in repository pcb.

commit 65bd793529cc6aae5f6f1946396cde03e55a2620
Author: Dima Kogan <dkogan at debian.org>
Date:   Sun Dec 25 14:55:05 2016 -0800

    We can now build arch-dependent and arch-independent packages only
    
    I.e. "dpkg-buildpackage -A" and "dpkg-buildpackage -B" works. Closes: #806092
---
 debian/rules | 32 ++++++++++++++++++++++----------
 1 file changed, 22 insertions(+), 10 deletions(-)

diff --git a/debian/rules b/debian/rules
index 759ed3d..e7df4c7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,26 +10,31 @@ CONFIGURE_OPTS=--disable-rpath --enable-dbus --disable-update-desktop-database -
 %:
 	dh $@ --with=autotools_dev
 
+# I configure build-gtk unconditionally (arch-dependent and arch-independent)
+# because I need a single configure invocation in both cases
 override_dh_auto_configure:
-	dh_auto_configure --builddirectory build_gtk -- $(CONFIGURE_OPTS) --with-gui=gtk
-	dh_auto_configure --builddirectory build_lesstif -- $(CONFIGURE_OPTS) --with-gui=lesstif
+	dh_auto_configure    --builddirectory build_gtk -- $(CONFIGURE_OPTS) --with-gui=gtk
+	dh_auto_configure -a --builddirectory build_lesstif -- $(CONFIGURE_OPTS) --with-gui=lesstif
 
 override_dh_auto_build:
-	dh_auto_build --builddirectory build_gtk
-	dh_auto_build --builddirectory build_lesstif
+	dh_auto_build -a --builddirectory build_gtk
+	dh_auto_build -a --builddirectory build_lesstif
 
 override_dh_auto_test:
-	dh_auto_test --builddirectory build_gtk
-	dh_auto_test --builddirectory build_lesstif
+	dh_auto_test -a --builddirectory build_gtk
+	dh_auto_test -a --builddirectory build_lesstif
 
-override_dh_auto_install:
-	dh_auto_install --builddirectory build_gtk
+override_dh_auto_install-arch:
+	make -C build_gtk install-exec DESTDIR=$$PWD/debian/tmp AM_UPDATE_INFO_DIR=no
+
+override_dh_auto_install-indep:
+	make -C build_gtk install-data DESTDIR=$$PWD/debian/tmp AM_UPDATE_INFO_DIR=no
 
 override_dh_auto_clean:
 	dh_auto_clean --builddirectory build_gtk
 	dh_auto_clean --builddirectory build_lesstif
 
-override_dh_install:
+override_dh_install-arch:
 	# Remove needlessly installed static library and header file before
 	# installing common files:
 	rm -rf $(CURDIR)/debian/tmp/usr/lib
@@ -42,6 +47,13 @@ override_dh_install:
 	# Install pcb-lesstif binary:
 	install build_lesstif/src/pcb debian/$(package)-lesstif/usr/bin/pcb-lesstif
 
+override_dh_install-indep:
+	# Remove needlessly installed static library and header file before
+	# installing common files:
+	rm -rf $(CURDIR)/debian/tmp/usr/lib
+	rm -rf $(CURDIR)/debian/tmp/usr/include
+	dh_install -Xusr/bin -Xusr/share/pcb- -Xusr/share/doc -Xexamples -Xtutorial -Xusr/share/info
+
 	# Set executable bit for pcb tools:
 	[ ! -d debian/$(package)-common ] || chmod a+x debian/$(package)-common/usr/share/pcb/tools/MergePCBPS
 	[ ! -d debian/$(package)-common ] || chmod a+x debian/$(package)-common/usr/share/pcb/tools/Merge_dimPCBPS
@@ -52,7 +64,7 @@ override_dh_install:
 	# Remove empty dirs:
 	[ ! -d debian/$(package)-common ] || find debian/$(package)-common -type d -empty -delete
 
-override_dh_fixperms:
+override_dh_fixperms-indep:
 	dh_fixperms
 	# Fix permissions of a couple of example files:
 	[ ! -d debian/$(package)-common ] || chmod -x debian/$(package)-common/usr/share/doc/$(package)-common/examples/LED.pcb

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-electronics/pcb.git