Merge commit 'upstream/1.7.2p6'

[debian/sudo] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 245e77e28a961654128a7ca1e8ac73de050ed948..8d69f81907499a7dcf4a5592a151b22a6b075833 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -21,8 +21,6 @@
 #
 # @configure_input@
 #
-# $Sudo: Makefile.in,v 1.340 2009/06/15 21:18:53 millert Exp $
-#
 
 #### Start of system configuration section. ####
 
@@ -405,9 +403,6 @@ sudoers.ldap.cat: sudoers.ldap.man
 @DEV@LICENSE: license.pod
 @DEV@  pod2text -l -i0 $> | sed '1,2d' > $@
 
-ChangeLog:
-       cvs2cl --follow-only trunk
-
 install: install-dirs install-binaries @INSTALL_NOEXEC@ install-sudoers install-man
 
 install-dirs:
@@ -462,11 +457,9 @@ realclean: distclean
 cleandir: realclean
 
 dist:
-       rm -f ../sudo-$(VERSION).tar.gz
-       ( cd .. ; TF="/tmp/sudo.dist$$$$" ; rm -f $$TF ; for i in $(DISTFILES) ; \
-         do echo sudo-$(VERSION)/$$i >> $$TF ; done ; \
-         tar Ocf sudo-$(VERSION).tar \
-         `cat $$TF` && gzip --best sudo-$(VERSION).tar && rm -f $$TF)
+       pax -w -x ustar -s '/^/sudo-$(VERSION)\//' -f ../sudo-$(VERSION).tar \
+               $(DISTFILES)
+       gzip -9f ../sudo-$(VERSION).tar
        ls -l ../sudo-$(VERSION).tar.gz
 
 bindist:
@@ -531,5 +524,3 @@ depot:
          gzip -f --best sudo-$(VERSION).depot; \
          rm -rf tmp.depot ; \
        )
-
-.PHONY:        ChangeLog