09-distcheck.patch

[Akim Demaille]

Index: ChangeLog
from  Akim Demaille  <address@hidden>
        * bin/Makefile.am (ETAGS_SH, ETAGS_PERL): Update: ifnames and
        autoheader are Perl programs.
        (autoconf, autoheader, autoreconf, autoupdate, ifnames, autoscan)
        (autom4te): Specify that the sources are in the $srcdir.
        * doc/autoconf.texi (Installation Directory Variables): Adjust.
        
        
Index: bin/Makefile.am
--- bin/Makefile.am Fri, 27 Sep 2002 20:14:45 +0200 akim
+++ bin/Makefile.am Sat, 28 Sep 2002 15:27:19 +0200 akim
@@ -53,46 +53,48 @@
        $(AUTOM4SH) $(srcdir)/autoconf.as -o $@
 
 ## All the files below depend on Makefile so that they are rebuilt
-## when the prefix etc. changes.
-autoconf: autoconf.in Makefile
+## when the prefix etc. changes.  It took quite a while to have these
+## rules correct, don't break them!  In particular, we believe there is
+## no solution to factor the code.
+autoconf: $(srcdir)/autoconf.in Makefile
        rm -f autoconf autoconf.tmp
-       $(edit) autoconf.in >autoconf.tmp
+       $(edit) $(srcdir)/autoconf.in >autoconf.tmp
        chmod +x autoconf.tmp
        mv autoconf.tmp autoconf
 
-autoheader: autoheader.in Makefile
+autoheader: $(srcdir)/autoheader.in Makefile
        rm -f autoheader autoheader.tmp
-       $(edit) autoheader.in >autoheader.tmp
+       $(edit) $(srcdir)/autoheader.in >autoheader.tmp
        chmod +x autoheader.tmp
        mv autoheader.tmp autoheader
 
-autom4te: autom4te.in Makefile
+autom4te: $(srcdir)/autom4te.in Makefile
        rm -f autom4te autom4te.tmp
-       $(edit) autom4te.in >autom4te.tmp
+       $(edit) $(srcdir)/autom4te.in >autom4te.tmp
        chmod +x autom4te.tmp
        mv autom4te.tmp autom4te
 
-autoreconf: autoreconf.in Makefile
+autoreconf: $(srcdir)/autoreconf.in Makefile
        rm -f autoreconf autoreconf.tmp
-       $(edit) autoreconf.in >autoreconf.tmp
+       $(edit) $(srcdir)/autoreconf.in >autoreconf.tmp
        chmod +x autoreconf.tmp
        mv autoreconf.tmp autoreconf
 
-autoscan: autoscan.in Makefile
+autoscan: $(srcdir)/autoscan.in Makefile
        rm -f autoscan autoscan.tmp
-       $(edit) autoscan.in >autoscan.tmp
+       $(edit) $(srcdir)/autoscan.in >autoscan.tmp
        chmod +x autoscan.tmp
        mv autoscan.tmp autoscan
 
-autoupdate: autoupdate.in Makefile
+autoupdate: $(srcdir)/autoupdate.in Makefile
        rm -f autoupdate autoupdate.tmp
-       $(edit) autoupdate.in >autoupdate.tmp
+       $(edit) $(srcdir)/autoupdate.in >autoupdate.tmp
        chmod +x autoupdate.tmp
        mv autoupdate.tmp autoupdate
 
-ifnames: ifnames.in Makefile
+ifnames: $(srcdir)/ifnames.in Makefile
        rm -f ifnames ifnames.tmp
-       $(edit) ifnames.in >ifnames.tmp
+       $(edit) $(srcdir)/ifnames.in >ifnames.tmp
        chmod +x ifnames.tmp
        mv ifnames.tmp ifnames
 
@@ -109,8 +111,9 @@ ifnames: ifnames.in Makefile
 DIGITS = 0123456789
 WORD_REGEXP = [$(LETTERS)$(letters)_][$(LETTERS)$(letters)$(DIGITS)_]*
 ETAGS_PERL = --lang=perl \
-  autoreconf.in autoupdate.in autoscan.in autom4te.in
+  autoheader.in autoreconf.in autoupdate.in autoscan.in autom4te.in \
+  ifnames.in
 ETAGS_SH = --lang=none --regex='/\($(WORD_REGEXP)\)=/\1/' \
-  autoconf.in autoheader.in ifnames.in
+  autoconf.in
 
 ETAGS_ARGS = $(ETAGS_PERL) $(ETAGS_SH)
Index: doc/autoconf.texi
--- doc/autoconf.texi Fri, 27 Sep 2002 20:14:45 +0200 akim
+++ doc/autoconf.texi Sat, 28 Sep 2002 15:31:20 +0200 akim
@@ -2250,17 +2250,17 @@ @node Installation Directory Variables
 @end group
 
 @group
-autoconf: Makefile autoconf.in
+autoconf: Makefile $(srcdir)/autoconf.in
         rm -f autoconf autoconf.tmp
-        $(edit) $< >autoconf.tmp
+        $(edit) $(srcdir)/autoconf.in >autoconf.tmp
         chmod +x autoconf.tmp
         mv autoconf.tmp autoconf
 @end group
 
 @group
-autoheader: Makefile autoheader.in
+autoheader: Makefile $(srcdir)/autoheader.in
         rm -f autoheader autoheader.tmp
-        $(edit) $< >autoheader.tmp
+        $(edit) $(srcdir)/autoconf.in >autoheader.tmp
         chmod +x autoheader.tmp
         mv autoheader.tmp autoheader
 @end group
@@ -2303,6 +2303,10 @@ .in:
 @end example
 
 @xref{Limitations of Make}, for details.
+
address@hidden @samp{$(srcdir)}
+Be sure to specify the path to the sources, otherwise the package won't
+support separated builds.
 @end table
 
 
Index: lib/autoscan/Makefile.am
--- lib/autoscan/Makefile.am Sat, 28 Sep 2002 11:02:29 +0200 akim
+++ lib/autoscan/Makefile.am Sat, 28 Sep 2002 15:30:48 +0200 akim
@@ -32,10 +32,10 @@
 ## is built (we need it in the command below).
 include ../freeze.mk
 
-autoscan.list: Makefile.am autoscan.pre $(autoconf_m4f_dependencies)
+autoscan.list: $(srcdir)/autoscan.pre $(autoconf_m4f_dependencies) Makefile.am
        echo '# Automatically Generated: do not edit this file' > autoscan.list
-       sed '/^[#]/!q' autoscan.pre >>autoscan.list
+       sed '/^[#]/!q' $(srcdir)/autoscan.pre >>autoscan.list
        ( \
-         sed -n '/^[^#]/p' autoscan.pre; \
+         sed -n '/^[^#]/p' $(srcdir)/autoscan.pre; \
          $(MY_AUTOM4TE) -M -l autoconf -t'AN_OUTPUT:$$1: $$2           $$3' \
        ) | sort >>autoscan.list