[grass] 07/20: Use {build,install}-arch targets in rules file.

[Bas Couwenberg]

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

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

commit 7ed2a728ba0d25448116c5b22eb12d77643121ba
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Thu Aug 21 19:58:00 2014 +0200

    Use {build,install}-arch targets in rules file.
---
 debian/changelog |  1 +
 debian/rules     | 14 +++++++++-----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9a5adc5..97764ce 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,7 @@ grass (6.4.4-1) UNRELEASED; urgency=low
   * Restructure control file with cme, remove duplice section 'science',
     add ${misc:Depends} for grass, remove obsolete ored build dependencies.
   * Add myself to Uploaders.
+  * Use {build,install}-arch targets in rules file.
 
  -- M. Hamish Bowman <hamish.webmail at gmail.com>  Mon, 11 Aug 2014 18:09:42 +1200
 
diff --git a/debian/rules b/debian/rules
index ffe2bff..40023af 100755
--- a/debian/rules
+++ b/debian/rules
@@ -94,10 +94,12 @@ config.status:
 
 	touch $@
 
+build: build-arch build-indep
+
 # This target generates arch-dep stuff, unfortunately most doc requires working bins to 
 # be properly generated...
-build: configure build-stamp
-build-stamp:  
+build-arch: configure build-arch-stamp
+build-arch-stamp:  
 	dh_testdir
 	$(MAKE) 
 	chmod 755 debian/fixpaths.sh debian/fixscripts.sh
@@ -152,7 +154,9 @@ true-clean:
 		rm -rf lib/$$LIBRARY/html lib/$$LIBRARY/latex ; \
 	done
 
-install: build
+install: install-arch install-indep
+
+install-arch: build-arch
 	dh_testdir
 	dh_testroot
 	dh_prep
@@ -252,7 +256,7 @@ install-indep: build-indep
 	-rm -f debian/tmp/programming-manual/html/jquery.js
 
 # Build architecture-independent files here.
-binary-indep: install install-indep 
+binary-indep: install-arch install-indep 
 	dh_testdir -i
 	dh_testroot -i
 	dh_installchangelogs -i CHANGES
@@ -268,7 +272,7 @@ binary-indep: install install-indep
 	dh_builddeb -i
 
 # Build architecture-dependent files here.
-binary-arch: install
+binary-arch: install-arch
 	dh_testdir -a
 	dh_testroot  -a
 	dh_installchangelogs -a CHANGES

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