X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=debian%2Frules;h=ffb2c9ba536dcdc8e3b6f47bf0124ebaf6dfd2fd;hb=34ed74aef9d9c42de391dea7387884359d439f57;hp=363c8c81bc91f920dcc2b32e01b2c2aaa7d1d0fe;hpb=81a1cb9028b75304b0261dfd91ba04c0e6b07bb4;p=debhelper.git

diff --git a/debian/rules b/debian/rules
index 363c8c8..ffb2c9b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,7 @@
 # I run the most current ones.
 #
 # This is _not_ a good example of a debhelper rules file, but I didn't need
-# to tell you that; just see the 25 lines of inlined perl below.. 
+# to tell you that; just see the chunk of inlined perl below.. 
 # See examples/ for some good examples.
 
 # Ensure that builds are self-hosting, which means I have to use the .pm
@@ -19,14 +19,11 @@ VERSION=$(shell expr "`dpkg-parsechangelog 2>/dev/null |grep Version:`" : '.*Ver
 
 PERLLIBDIR=$(shell perl -MConfig -e 'print $$Config{vendorlib}')
 
-# Debug
-#export DH_VERBOSE=1
-
 build: test build-stamp
 build-stamp:
 	# Generate the main man page. All the perl cruft is to get a list
 	# of debhelper commands with short descriptions into the man page.
-	pod2man -c Debhelper -r "$(VERSION)" debhelper.pod | \
+	pod2man --section=7 -c Debhelper -r "$(VERSION)" debhelper.pod | \
 	perl -e ' \
 		undef $$/; \
 		foreach (@ARGV) { \
@@ -42,16 +39,19 @@ build-stamp:
 		        	s/#LIST#/$$collect/; \
 				print; \
 			}; \
-		}' `find . -type f -perm +1 -maxdepth 1 -name "dh_*" | sort` > debhelper.1
+		}' `find . -type f -perm +100 -maxdepth 1 -name "dh_*" | sort` > debhelper.7
 	# Turn all executables into man pages.
-	find . -type f -perm +1 -maxdepth 1 -name "dh_*" \
+	find . -type f -perm +100 -maxdepth 1 -name "dh_*" \
 		-exec pod2man -c Debhelper -r "$(VERSION)" {} {}.1 \;
+	printf "package Debian::Debhelper::Dh_Version;\n\$$version='$(VERSION)';" > \
+		Debian/Debhelper/Dh_Version.pm
+
 	touch build-stamp
 
 clean:
 	./dh_testdir
 	./dh_testroot
-	-./dh_clean *.1 *-stamp
+	-./dh_clean *.1 *.7 *-stamp Debian/Debhelper/Dh_Version.pm
 
 test: test-stamp
 test-stamp:
@@ -69,24 +69,12 @@ binary-indep: build
 	./dh_testdir
 	./dh_testroot
 	./dh_clean -k
-	./dh_installdirs usr/bin usr/share/debhelper \
-		$(PERLLIBDIR)/Debian/Debhelper
-
-	printf "package Debian::Debhelper::Dh_Version;\n\$$version='$(VERSION)';" > \
-		debian/debhelper/$(PERLLIBDIR)/Debian/Debhelper/Dh_Version.pm
-
-	find . -perm +111 -maxdepth 1 -type f -not -name "*.pl" \
-		-exec install -p {} debian/debhelper/usr/bin \;
-	cp -a Debian/Debhelper/*.pm \
-		debian/debhelper/$(PERLLIBDIR)/Debian/Debhelper/
-	cp -a autoscripts debian/debhelper/usr/share/debhelper
-	rm -rf debian/debhelper/usr/share/debhelper/autoscripts/CVS
-
-	./dh_installdocs `find doc -type f | grep -v CVS`
-	./dh_installexamples `find examples -type f | grep -v CVS`
-	./dh_installmenu
-	./dh_installman *.1
-	./dh_installinfo
+	./dh_install -X .1 dh_* usr/bin
+	./dh_install Debian/Debhelper/*.pm $(PERLLIBDIR)/Debian/Debhelper/
+	./dh_install autoscripts usr/share/debhelper
+	./dh_installdocs doc/*
+	./dh_installexamples examples/*
+	./dh_installman *.1 *.7
 	./dh_installchangelogs
 	./dh_shlibdeps
 	./dh_link
@@ -100,9 +88,10 @@ binary-indep: build
 
 # Update the debhelper web page. Not intended for use by anyone except the
 # author.
+DIR=/home/web/kitenet.net/programs/debhelper
 installhook:
-	cp debian/changelog /home/pub/programs/debhelper/CHANGES
-	echo -n $(VERSION) > /home/pub/programs/debhelper/LATEST-VERSION-IS
+	cp debian/changelog $(DIR)/CHANGES
+	echo -n $(VERSION) > $(DIR)/LATEST-VERSION-IS
 
 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary dist