From d7b2910295bcb86ed1ca763832af17b2ee2bb7a0 Mon Sep 17 00:00:00 2001
From: "Todd C. Miller" <Todd.Miller@courtesan.com>
Date: Thu, 10 Jun 2010 17:29:47 -0400
Subject: [PATCH] Use the --file argument to config.status instead of setting
 CONFIG_FILES

--HG--
branch : 1.7
---
 Makefile.in | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index b0bb0474c..1ec099054 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -419,7 +419,7 @@ sudo.man.in: $(srcdir)/sudo.pod
 	( cd $(srcdir); mansectsu=`echo @MANSECTSU@|tr A-Z a-z`; mansectform=`echo @MANSECTFORM@|tr A-Z a-z`; sed -n -e '/^=pod/q' -e 's/^/.\\" /p' sudo.pod > $@; pod2man --quotes=none --date="`date '+%B %e, %Y'`" --section=$$mansectsu --release=$(VERSION) --center="MAINTENANCE COMMANDS" sudo.pod | sed -e "s/(5)/($$mansectform)/" -e "s/(8)/($$mansectsu)/" | perl -p sudo.man.pl >> $@ )
 
 sudo.man: sudo.man.in
-	CONFIG_FILES=$@ CONFIG_HEADERS= sh ./config.status
+	$(SHELL) config.status --file=$@
 
 sudo.cat: sudo.man
 
@@ -428,7 +428,7 @@ visudo.man.in: $(srcdir)/visudo.pod
 	( cd $(srcdir); mansectsu=`echo @MANSECTSU@|tr A-Z a-z`; mansectform=`echo @MANSECTFORM@|tr A-Z a-z`; sed -n -e '/^=pod/q' -e 's/^/.\\" /p' visudo.pod > $@; pod2man --quotes=none --date="`date '+%B %e, %Y'`" --section=$$mansectsu --release=$(VERSION) --center="MAINTENANCE COMMANDS" visudo.pod | sed -e "s/(5)/($$mansectform)/" -e "s/(8)/($$mansectsu)/" -e 's|\\fI\\f\((CW*\)*I@\([^@]*\)\\fI@|\\fI@\2@|g' >> $@ )
 
 visudo.man: visudo.man.in
-	CONFIG_FILES=$@ CONFIG_HEADERS= sh ./config.status
+	$(SHELL) config.status --file=$@
 
 visudo.cat: visudo.man
 
@@ -436,8 +436,8 @@ sudoers.man.in: $(srcdir)/sudoers.pod
 	@rm -f $(srcdir)/$@
 	( cd $(srcdir); mansectsu=`echo @MANSECTSU@|tr A-Z a-z`; mansectform=`echo @MANSECTFORM@|tr A-Z a-z`; sed -n -e '/^=pod/q' -e 's/^/.\\" /p' sudoers.pod > $@; pod2man --quotes=none --date="`date '+%B %e, %Y'`" --section=$$mansectform --release=$(VERSION) --center="MAINTENANCE COMMANDS" sudoers.pod | sed -e "s/(5)/($$mansectform)/" -e "s/(8)/($$mansectsu)/" | perl -p sudoers.man.pl >> $@ )
 
-sudoers.man:: sudoers.man.in
-	CONFIG_FILES=$@ CONFIG_HEADERS= sh ./config.status
+sudoers.man: sudoers.man.in
+	$(SHELL) config.status --file=$@
 
 sudoers.cat: sudoers.man
 
@@ -445,8 +445,8 @@ sudoers.ldap.man.in: $(srcdir)/sudoers.ldap.pod
 	@rm -f $(srcdir)/$@
 	( cd $(srcdir); mansectsu=`echo @MANSECTSU@|tr A-Z a-z`; mansectform=`echo @MANSECTFORM@|tr A-Z a-z`; sed -n -e '/^=pod/q' -e 's/^/.\\" /p' sudoers.ldap.pod > $@; pod2man --quotes=none --date="`date '+%B %e, %Y'`" --section=$$mansectform --release=$(VERSION) --center="MAINTENANCE COMMANDS" sudoers.ldap.pod | sed -e "s/(5)/($$mansectform)/" -e "s/(8)/($$mansectsu)/" -e 's|\\fI\\f\((CW*\)*I@\([^@]*\)\\fI@|\\fI@\2@|g' >> $@ )
 
-sudoers.ldap.man:: sudoers.ldap.man.in
-	CONFIG_FILES=$@ CONFIG_HEADERS= sh ./config.status
+sudoers.ldap.man: sudoers.ldap.man.in
+	$(SHELL) config.status --file=$@
 
 sudoers.ldap.cat: sudoers.ldap.man
 
@@ -454,8 +454,8 @@ sudoreplay.man.in: $(srcdir)/sudoreplay.pod
 	@rm -f $(srcdir)/$@
 	( cd $(srcdir); mansectsu=`echo @MANSECTSU@|tr A-Z a-z`; mansectform=`echo @MANSECTFORM@|tr A-Z a-z`; sed -n -e '/^=pod/q' -e 's/^/.\\" /p' sudoreplay.pod > $@; pod2man --quotes=none --date="`date '+%B %e, %Y'`" --section=$$mansectsu --release=$(VERSION) --center="MAINTENANCE COMMANDS" sudoreplay.pod | sed -e "s/(5)/($$mansectform)/" -e "s/(8)/($$mansectsu)/" -e 's|\\fI\\f\((CW*\)*I@\([^@]*\)\\fI@|\\fI@\2@|g' >> $@ )
 
-sudoreplay.man:: sudoreplay.man.in
-	CONFIG_FILES=$@ CONFIG_HEADERS= sh ./config.status
+sudoreplay.man: sudoreplay.man.in
+	$(SHELL) config.status --file=$@
 
 sudoers.cat: sudoers.man
 
@@ -551,7 +551,7 @@ bindist: ChangeLog
 	    cp .libs/lib$(noexecfile) $$tdir/$(noexecfile) ; \
 	  fi ; \
 	  cp $(srcdir)/INSTALL.binary $$tdir/INSTALL ; \
-	  sh ./config.status --file=Makefile.binary && cp Makefile.binary $$tdir/Makefile ; \
+	  $(SHELL) ./config.status --file=Makefile.binary && cp Makefile.binary $$tdir/Makefile ; \
 	  strip $$tdir/sudo ; \
 	  strip $$tdir/visudo ; \
 	  cd tmp.$$ARCH && tar Ocf ../sudo-$(VERSION)-$$ARCH.tar sudo-$(VERSION) && cd .. ; \
-- 
2.40.0