[proj] 15/21: Use build-arch and build-indep targets.

[Bas Couwenberg]

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

sebastic-guest pushed a commit to branch master
in repository proj.

commit 8415010379f976995645942dab4766261a53f374
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Apr 12 13:45:23 2014 +0200

    Use build-arch and build-indep targets.
---
 debian/rules | 44 ++++++++++++++++++++++++--------------------
 1 file changed, 24 insertions(+), 20 deletions(-)

diff --git a/debian/rules b/debian/rules
index 4738672..3ff6b3e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -43,12 +43,18 @@ config.status:
 	dh_autoreconf
 	./configure --prefix=/usr --infodir=/usr/share/info --mandir=/usr/share/man
 
-build: config build-stamp
-build-stamp:
+build: build-arch build-indep
+
+build-arch: build-arch-stamp
+build-arch-stamp: config
 	dh_testdir
 	$(MAKE) CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" CPPFLAGS="$(CPPFLAGS)"
 	touch $@
 
+build-indep: build-indep-stamp
+build-indep-stamp: config
+	touch $@
+
 clean: 
 	dh_testdir
 	dh_testroot
@@ -67,12 +73,14 @@ clean:
 	         nad/null nad/prvi \
 	         nad/stgeorge nad/stlrnc nad/stpaul
 
-install: build install-stamp
-install-stamp:
+install: install-arch install-indep
+
+install-arch: install-arch-stamp
+install-arch-stamp: build-arch
 	dh_testdir
 	dh_testroot
-	dh_installdirs
-	dh_prep 
+	dh_installdirs -a
+	dh_prep -a
 	
 	$(MAKE) DESTDIR=$(CURDIR)/debian/tmp install 
 	cp $(CURDIR)/src/projects.h $(CURDIR)/debian/tmp/usr/include/.
@@ -89,8 +97,12 @@ install-stamp:
 	sed -i "/dependency_libs/ s/'.*'/''/" `find . -name '*.la'`
 	touch $@
 
-install-data: build install-data-stamp
-install-data-stamp:
+install-indep: install-indep-stamp
+install-indep-stamp: build-indep
+	touch $@
+
+install-data: install-data-stamp
+install-data-stamp: build-arch
 	dh_testdir
 	dh_testroot
 	dh_installdirs
@@ -98,19 +110,11 @@ install-data-stamp:
 	touch $@
 
 # Build architecture-independent files here.
-binary-indep: 
-	dh_testdir -i
-	dh_testroot -i
-	dh_install -i -X.svn
-	dh_installdocs -i
-	dh_installchangelogs -i
-	dh_installdeb -i
-	dh_gencontrol -i
-	dh_md5sums -i
-	dh_builddeb -i
+binary-indep: install-indep
+	# proj has no "Architecture: all" binary packages
 
 # Build architecture-dependent files here.
-binary-arch: install 
+binary-arch: install-arch
 	dh_testdir -a
 	dh_testroot -a
 	dh_install -a -X.svn
@@ -133,6 +137,6 @@ binary-arch: install
 source diff:                                                                  
 	@echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
 
-binary: binary-indep binary-arch
+binary: binary-arch binary-indep
 
 .PHONY: build clean binary-indep binary-arch binary datumgrids config install

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