X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=examples%2Frules.multi2;h=12b2d9c5b8ab85e07c648503a730b5fb4a35c923;hb=d579dae0cf159c50dcd902ff4a35590f7dcff395;hp=30c9b41d44b489dbcc7dd5dd926619302aa7cb80;hpb=da7d6c32c080678dc672f7c6e680c11569f46eda;p=debhelper.git

diff --git a/examples/rules.multi2 b/examples/rules.multi2
index 30c9b41..12b2d9c 100755
--- a/examples/rules.multi2
+++ b/examples/rules.multi2
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 # Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
+# This file is public domain software, originally written by Joey Hess.
 #
 # This version is for a multibinary package. It also allows you to build any
 # of the binary packages independantly, via binary-<package> targets.
@@ -8,9 +8,6 @@
 # Uncomment this to turn on verbose mode. 
 #export DH_VERBOSE=1
 
-# This is the debhelper compatability version to use.
-export DH_COMPAT=1
-
 # This has to be exported to make some magic below work.
 export DH_OPTIONS
 
@@ -26,7 +23,7 @@ build-stamp:
 clean:
 	dh_testdir
 	dh_testroot
-	rm -f build-stamp install-stamp
+	rm -f build-stamp
 
 	# Add here commands to clean up after the build process.
 	#-$(MAKE) clean
@@ -35,7 +32,7 @@ clean:
 	dh_clean
 
 install: DH_OPTIONS=
-install:
+install: build
 	dh_testdir
 	dh_testroot
 	dh_clean -k
@@ -44,53 +41,55 @@ install:
 	# Add here commands to install the package into debian/tmp.
 	#$(MAKE) prefix=`pwd`/debian/tmp/usr install
 
-	dh_movefiles
-	touch install-stamp
+	dh_install
 
 # This single target is used to build all the packages, all at once, or
 # one at a time. So keep in mind: any options passed to commands here will
 # affect _all_ packages. Anything you want to only affect one package
 # should be put in another target, such as the install target.
 binary-common:
-	# Need this version of debhelper for DH_OPTIONS to work.
-	dh_testversion 1.1.17
 	dh_testdir
 	dh_testroot
+	dh_installchangelogs
 	dh_installdocs
 	dh_installexamples
 	dh_installmenu
+#	dh_installdebconf
+#	dh_installlogrotate
 #	dh_installemacsen
+#	dh_installcatalogs
 #	dh_installpam
+#	dh_installmime
 #	dh_installinit
-	dh_installcron
-#	dh_installmanpages
-	dh_installinfo
+#	dh_installman
+#	dh_installcron
+#	dh_installinfo
 #	dh_undocumented
-	dh_installchangelogs
+	dh_strip
 	dh_link
 	dh_compress
 	dh_fixperms
-	dh_suidregister
+#	dh_perl
+#	dh_python
 #	dh_makeshlibs
 	dh_installdeb
-#	dh_perl
 	dh_shlibdeps
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb
 
 # Build architecture independant packages using the common target.
-# (Comment this out if you have none to build.)
-binary-indep: DH_OPTIONS=-i
-binary-arch: build install binary-common
+binary-indep: build install
+# (Uncomment this next line if you have such packages.)
+#	 $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
 
 # Build architecture dependant packages using the common target.
-binary-arch: DH_OPTIONS=-a
-binary-arch: build install binary-common
+binary-arch: build install
+	$(MAKE) -f debian/rules DH_OPTIONS=-a binary-common
 
 # Any other binary targets build just one binary package at a time.
 binary-%: build install
 	make -f debian/rules binary-common DH_OPTIONS=-p$*
 
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+.PHONY: build clean binary-indep binary-arch binary-common binary install