[DebianGIS-dev] r1219 - packages/gpsdrive/trunk/debian

[nd-guest at alioth.debian.org]

Author: nd-guest
Date: 2007-10-17 12:20:56 +0000 (Wed, 17 Oct 2007)
New Revision: 1219

Modified:
   packages/gpsdrive/trunk/debian/rules
Log:
distinct binary-arch, binary-indep


Modified: packages/gpsdrive/trunk/debian/rules
===================================================================
--- packages/gpsdrive/trunk/debian/rules	2007-10-17 12:20:13 UTC (rev 1218)
+++ packages/gpsdrive/trunk/debian/rules	2007-10-17 12:20:56 UTC (rev 1219)
@@ -50,18 +50,25 @@
 				--enable-mapnik \
 				CFLAGS="$(CFLAGS)"
 
-build: build-stamp
-build-stamp: config.status
+				
+build: build-arch build-indep
+
+build-arch: config.status build-arch-stamp
+build-arch-stamp:
 	dh_testdir
 	$(MAKE)
 	touch $@
 
+build-indep: config.status build-indep-stamp
+build-indep-stamp:
+	touch $@
+	
 clean: clean-patched unpatch	
 
 clean-patched:
 	dh_testdir
 	dh_testroot
-	rm -f build-stamp
+	rm -f build-arch-stamp build-indep-stamp
 	[ ! -f Makefile ] || $(MAKE) distclean
 ifneq "$(wildcard /usr/share/misc/config.sub)" ""
 	cp -f /usr/share/misc/config.sub config.sub
@@ -71,30 +78,45 @@
 endif
 	dh_clean
 
-install: build
+install: install-arch install-indep
+
+install-arch: build-arch
 	dh_testdir
 	dh_testroot
 	dh_clean -k
-	dh_installdirs
-	$(MAKE) install DESTDIR=$(DESTDIR)
+	dh_installdirs -a
+	$(MAKE) -C data/ \
+			install-appsDATA \
+			install-cfg_filesDATA \
+			install-pixmapDATA \
+			install-poiDATA \
+			install-mapsDATA \
+			DESTDIR=$(DESTDIR)
+	install -d $(CURDIR)/debian/tmp/usr/share/gpsdrive/mapnik			
+	install -m 644 $(CURDIR)/scripts/mapnik/osm.xml $(CURDIR)/debian/tmp/usr/share/gpsdrive/mapnik/osm.xml
+	install -d $(CURDIR)/debian/tmp/usr/share/map-icons
+	install -m 644 $(CURDIR)/data/map-icons/icons.xml $(CURDIR)/debian/tmp/usr/share/map-icons/icons.xml
+	$(MAKE) -C scripts/mapnik/ install			
+	$(MAKE) -C src/ install DESTDIR=$(DESTDIR)			
+			
+install-indep: build-indep
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs -i
+	$(MAKE) -C scripts/ install DESTDIR=$(DESTDIR)
+	$(MAKE) -C data/map-icons/ install DESTDIR=$(DESTDIR)
 
-binary-indep: build install
-
-binary-arch: build install
+binary-indep: build-indep install-indep
 	dh_testdir
 	dh_testroot
-	dh_installchangelogs ChangeLog
-	dh_installdocs -Xdebian/TODO
-	dh_installman --language=C 
-	dh_installman --language=de -pgpsdrive man/de/gpsdrive.1 
-	dh_installman --language=es -pgpsdrive man/es/gpsdrive.1 
-	dh_installexamples
-	dh_install --sourcedir=$(DESTDIR)
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_makeshlibs
-	dh_installdeb
+	dh_installchangelogs -i ChangeLog
+	dh_installdocs -i -Xdebian/TODO
+	dh_installman -i --language=C
+	dh_install -i --sourcedir=$(DESTDIR)
+	dh_compress -i
+	dh_fixperms -i
+	dh_installdeb -i
 	# strip language extensions
 	mv -f $(CURDIR)/debian/gpsdrive-scripts/usr/bin/convert-waypoints.pl $(CURDIR)/debian/gpsdrive-scripts/usr/bin/convert-waypoints
 	mv -f $(CURDIR)/debian/gpsdrive-scripts/usr/bin/geoinfo.pl $(CURDIR)/debian/gpsdrive-scripts/usr/bin/geoinfo
@@ -110,12 +132,31 @@
 	mv -f $(CURDIR)/debian/gpsdrive-scripts/usr/share/man/man1/poi-manager.pl.1.gz \
 		  $(CURDIR)/debian/gpsdrive-scripts/usr/share/man/man1/poi-manager.1.gz
 	# install gpsfetchmap from debian/scripts
-	cp -f $(CURDIR)/debian/scripts/gpsfetchmap.pl $(CURDIR)/debian/gpsdrive-scripts/usr/bin/gpsfetchmap
-	dh_shlibdeps
-	dh_perl
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
+	install -m 755 $(CURDIR)/debian/scripts/gpsfetchmap.pl $(CURDIR)/debian/gpsdrive-scripts/usr/bin/gpsfetchmap
+	dh_perl -i
+	dh_gencontrol -i
+	dh_md5sums -i
+	dh_builddeb -i
 
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+binary-arch: build-arch install-arch
+	dh_testdir
+	dh_testroot
+	dh_installchangelogs -a ChangeLog
+	dh_installdocs -a -Xdebian/TODO
+	dh_installman  -a --language=C 
+	dh_installman  -a --language=de -pgpsdrive man/de/gpsdrive.1 
+	dh_installman  -a --language=es -pgpsdrive man/es/gpsdrive.1 
+	dh_installexamples -a
+	dh_install -a --sourcedir=$(DESTDIR)
+	dh_strip -a
+	dh_compress -a
+	dh_fixperms -a
+	dh_makeshlibs -a
+	dh_installdeb -a
+	dh_shlibdeps -a
+	dh_gencontrol -a 
+	dh_md5sums -a
+	dh_builddeb -a
+
+binary: binary-arch binary-indep
+.PHONY: build clean binary-indep binary-arch binary install-arch install-indep install