Mmm... my previous patch was a bit dodgy. Here's a new one, and its
features are:

- sudo package can be rebuilt multiple times (same as previous patch)
- Doesn't ignore errors in $(MAKE) commands
- Always picks up changes in the .pod documentation

Works for me!

-Ted
diff -ru sudo-1.6.8p12/debian/rules sudo-1.6.8p12-new/debian/rules
--- sudo-1.6.8p12/debian/rules	2006-08-28 21:27:08.000000000 +1000
+++ sudo-1.6.8p12-new/debian/rules	2006-08-28 22:23:35.000000000 +1000
@@ -48,11 +48,10 @@
 	dh_testdir
 
 	# ensure our pod changes get picked up
-	-rm -f sudoers.man.in sudoers.man sudo.man.in sudo.man
-	-$(MAKE) sudoers.man.in sudo.man.in
+	$(MAKE) -C build-simple sudoers.man.in sudo.man.in visudo.man.in
 
-	-$(MAKE) -C build-simple
-	-$(MAKE) -C build-ldap
+	$(MAKE) -C build-simple
+	$(MAKE) -C build-ldap
 
 	touch build-stamp
 
diff -ru sudo-1.6.8p12/Makefile.in sudo-1.6.8p12-new/Makefile.in
--- sudo-1.6.8p12/Makefile.in	2006-08-28 21:27:08.000000000 +1000
+++ sudo-1.6.8p12-new/Makefile.in	2006-08-28 22:24:44.000000000 +1000
@@ -318,7 +318,7 @@
 	    $(INSTALL) -O $(sudoers_uid) -G $(sudoers_gid) -M $(sudoers_mode) \
 		$(srcdir)/sudoers $(DESTDIR)$(sudoersdir)/sudoers
 
-install-man:
+install-man: sudo.$(mantype) visudo.$(mantype) sudoers.$(mantype)
 	$(INSTALL) -O $(install_uid) -G $(install_gid) -M 0444 @mansrcdir@/sudo.$(mantype) $(DESTDIR)$(mandirsu)/sudo.$(mansectsu)
 	@rm -f $(DESTDIR)$(mandirsu)/sudoedit.$(mansectsu)
 	ln $(DESTDIR)$(mandirsu)/sudo.$(mansectsu) $(DESTDIR)$(mandirsu)/sudoedit.$(mansectsu)

Attachment: signature.asc
Description: OpenPGP digital signature

Reply via email to