X-Git-Url: https://git.donarmstrong.com/?p=debhelper.git;a=blobdiff_plain;f=Makefile;h=38f3c15d7b2370d5e7136e747b84e14f831993fe;hp=f13b3fc9c20b6b4d495eb33bb7446b6e38013e06;hb=fb8f18f4a98669c3b85e1bd7920fbabfc00b886e;hpb=220fc31652cf112b333c195cde759fe5f04d182f

diff --git a/Makefile b/Makefile
index f13b3fc..38f3c15 100644
--- a/Makefile
+++ b/Makefile
@@ -1,3 +1,9 @@
+# List of files of dh_* commands. Sorted for debhelper man page.
+COMMANDS=$(shell find . -maxdepth 1 -type f -perm +100 -name "dh_*" -printf "%f\n" | sort)
+
+# Find deprecated commands by looking at their synopsis.
+DEPRECATED=$(shell egrep -l '^dh_.* - .*deprecated' $(COMMANDS))
+
 # This generates a list of synopses of debhelper commands, and substitutes
 # it in to the #LIST# line on the man page fed to it on stdin. Must be passed
 # parameters of all the executables or pod files to get the synopses from.
@@ -10,12 +16,19 @@ MAKEMANLIST=perl -e ' \
 		        $$file=<IN>; \
 		        close IN; \
 		        if ($$file=~m/=head1 .*?\n\n(.*?) - (.*?)\n\n/s) { \
-		                $$collect.="=item $$1(1)\n\n$$2\n\n"; \
+				my $$item="=item $$1(1)\n\n$$2\n\n"; \
+				if (" $(DEPRECATED) " !~ / $$1 /) { \
+			                $$list.=$$item; \
+				} \
+				else { \
+			                $$list_deprecated.=$$item; \
+				} \
 		        } \
 		} \
 		END { \
 			while (<STDIN>) { \
-		        	s/\#LIST\#/$$collect/; \
+		        	s/\#LIST\#/$$list/; \
+		        	s/\#LIST_DEPRECATED\#/$$list_deprecated/; \
 				print; \
 			}; \
 		}'
@@ -25,18 +38,15 @@ VERSION=$(shell expr "`dpkg-parsechangelog |grep Version:`" : '.*Version: \(.*\)
 
 PERLLIBDIR=$(shell perl -MConfig -e 'print $$Config{vendorlib}')/Debian/Debhelper
 
-POD2MAN=pod2man -c Debhelper -r "$(VERSION)"
+POD2MAN=pod2man --utf8 -c Debhelper -r "$(VERSION)"
 
 # l10n to be built is determined from .po files
 LANGS=$(notdir $(basename $(wildcard man/po4a/po/*.po)))
 
-build: version
+build: version debhelper.7
 	find . -maxdepth 1 -type f -perm +100 -name "dh*" \
 		-exec $(POD2MAN) {} {}.1 \;
-	cat debhelper.pod | \
-		$(MAKEMANLIST) `find . -maxdepth 1 -type f -perm +100 -name "dh_*" | sort` | \
-		$(POD2MAN) --name="debhelper" --section=7  > debhelper.7
-	po4a -L UTF-8 man/po4a/po4a.cfg 
+	po4a --previous -L UTF-8 man/po4a/po4a.cfg 
 	set -e; \
 	for lang in $(LANGS); do \
 		dir=man/$$lang; \
@@ -44,18 +54,25 @@ build: version
 			prog=`basename $$file | sed 's/.pod//'`; \
 			$(POD2MAN) $$file $$prog.$$lang.1; \
 		done; \
-		cat $$dir/debhelper.pod | \
-			$(MAKEMANLIST) `find $$dir -type f -maxdepth 1 -name "dh_*.pod" | sort` | \
-			$(POD2MAN) --name="debhelper" --section=7 > debhelper.$$lang.7; \
+		if [ -e $$dir/debhelper.pod ]; then \
+			cat $$dir/debhelper.pod | \
+				$(MAKEMANLIST) `find $$dir -type f -maxdepth 1 -name "dh_*.pod" | sort` | \
+				$(POD2MAN) --name="debhelper" --section=7 > debhelper.$$lang.7; \
+		fi; \
 	done
 
 version:
 	printf "package Debian::Debhelper::Dh_Version;\n\$$version='$(VERSION)';\n1" > \
 		Debian/Debhelper/Dh_Version.pm
 
+debhelper.7: debhelper.pod
+	cat debhelper.pod | \
+		$(MAKEMANLIST) $(COMMANDS) | \
+		$(POD2MAN) --name="debhelper" --section=7  > debhelper.7
+
 clean:
 	rm -f *.1 *.7 Debian/Debhelper/Dh_Version.pm
-	po4a --rm-translations --rm-backups man/po4a/po4a.cfg
+	po4a --previous --rm-translations --rm-backups man/po4a/po4a.cfg
 	for lang in $(LANGS); do \
 		if [ -e man/$$lang ]; then rmdir man/$$lang; fi; \
 	done;
@@ -65,7 +82,7 @@ install:
 		$(DESTDIR)/usr/share/debhelper/autoscripts \
 		$(DESTDIR)$(PERLLIBDIR)/Sequence \
 		$(DESTDIR)$(PERLLIBDIR)/Buildsystem
-	install $(shell find -maxdepth 1 -mindepth 1 -name dh\* |grep -v \.1\$$) $(DESTDIR)/usr/bin
+	install dh $(COMMANDS) $(DESTDIR)/usr/bin
 	install -m 0644 autoscripts/* $(DESTDIR)/usr/share/debhelper/autoscripts
 	install -m 0644 Debian/Debhelper/*.pm $(DESTDIR)$(PERLLIBDIR)
 	install -m 0644 Debian/Debhelper/Sequence/*.pm $(DESTDIR)$(PERLLIBDIR)/Sequence