Remove references to standards.*.

	Add autoreconf.
(dist): Add .., ../etc, and ../texinfo files.
Add autoscan and its data files.
	Check for perl.

diff --git a/Makefile.in b/Makefile.in
index 00b4cc0aa6c09d357255e3fa1f7282699d564b12..277177d95aa768827ed869099721dc20d3ef5627 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,5 +1,5 @@
 # Makefile for Autoconf.
-# Copyright (C) 1992, 1993 Free Software Foundation, Inc.
+# Copyright (C) 1992, 1993, 1994 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -26,6 +26,10 @@ INSTALL_DATA = @INSTALL_DATA@
 MAKEINFO = makeinfo
 TEXI2DVI = texi2dvi
 M4 = @M4@
+# Programs that we can not install if perl is missing.
+PROGS = @PROGS@
+# Path of the perl interpreter.
+PERL = @PERL@
 
 prefix = /usr/local
 exec_prefix = $(prefix)
@@ -44,14 +48,35 @@ infodir = $(prefix)/info
 
 SHELL = /bin/sh
 
-DISTFILES = README Makefile.in INSTALL NEWS COPYING ChangeLog \
-autoconf.texi acconfig.h autoconf.sh acgeneral.m4 acspecific.m4 \
-configure configure.in autoheader.sh mkinstalldirs install.sh \
-autoconf.info standards.texi make-stds.texi standards.info texinfo.tex
+# Files that can be generated, but should be in the distribution.
+DISTSTUFF = info Makefile
+# Files to distribute.
+DISTROOT = COPYING Makefile.in README \
+       config.guess config.sub configure configure.in \
+       install.sh move-if-change
+DISTAUTOCONF = autoconf/ChangeLog \
+       autoconf/INSTALL autoconf/Makefile.in autoconf/NEWS \
+       autoconf/README autoconf/acconfig.h autoconf/acfunctions \
+       autoconf/acgeneral.m4 autoconf/acheaders autoconf/acidentifiers \
+       autoconf/acmakevars autoconf/acprograms autoconf/acspecific.m4 \
+       autoconf/autoconf.sh autoconf/autoconf.texi \
+       autoconf/autoheader.sh autoconf/autoscan.pl autoconf/autoreconf.sh \
+       autoconf/configure autoconf/configure.in autoconf/mkinstalldirs \
+       autoconf/autoconf.info*
+
+DISTETC = etc/Makefile.in \
+       etc/cfg-paper.texi etc/configure.in etc/configure.man \
+       etc/configure.texi etc/standards.texi etc/make-stds.texi \
+       etc/cfg-paper.info* etc/configure.info* etc/standards.info*
+DISTTEXINFO = texinfo/tex3patch texinfo/texinfo.tex
+
+# Where to find texinfo.tex to format documentation with TeX.
+TEXIDIR = $(srcdir)/../texinfo
 
 editsh = sed -e 's,@''datadir''@,$(acdatadir),g' -e 's,@''M4''@,$(M4),g'
+editpl = sed -e 's,@''datadir''@,$(acdatadir),g' -e 's,@''PERL''@,$(PERL),g'
 
-all: autoconf autoheader autoconf.info standards.info
+all: autoconf autoheader ${PROGS}
 
 autoconf: autoconf.sh
        rm -f $@ $@.tmp
@@ -61,45 +86,58 @@ autoheader: autoheader.sh
        rm -f $@ $@.tmp
        $(editsh) $(srcdir)/autoheader.sh > $@.tmp && mv $@.tmp $@ && chmod +x $@
 
-info: autoconf.info standards.info
+autoreconf: autoreconf.sh
+       rm -f $@ $@.tmp
+       $(editsh) $(srcdir)/autoreconf.sh > $@.tmp && mv $@.tmp $@ && chmod +x $@
 
-autoconf.info: autoconf.texi
-       $(MAKEINFO) -I$(srcdir) $(srcdir)/autoconf.texi --no-split --output=$@
+autoscan: autoscan.pl
+       rm -f $@ $@.tmp
+       $(editpl) $(srcdir)/autoscan.pl > $@.tmp && mv $@.tmp $@ && chmod +x $@
 
-standards.info: standards.texi make-stds.texi
-       $(MAKEINFO) -I$(srcdir) $(srcdir)/standards.texi --no-split --output=$@
+info: autoconf.info
 
-dvi: autoconf.dvi standards.dvi
+autoconf.info: autoconf.texi
+       $(MAKEINFO) -I$(srcdir) $(srcdir)/autoconf.texi --output=$@
 
-autoconf.dvi: autoconf.texi
-       $(TEXI2DVI) $(srcdir)/autoconf.texi
+dvi: autoconf.dvi
 
-standards.dvi: standards.texi make-stds.texi
-       $(TEXI2DVI) $(srcdir)/standards.texi
+autoconf.dvi: autoconf.texi
+       TEXINPUTS=$(TEXIDIR):$$TEXINPUTS $(TEXI2DVI) $(srcdir)/autoconf.texi
 
 check:
+installcheck:
 
-installdirs:
+installdirs: mkinstalldirs $(bindir) $(infodir) $(acdatadir)
        $(SHELL) ${srcdir}/mkinstalldirs $(bindir) $(infodir) $(acdatadir)
 
 # References to install-info have been removed until it's released.
-install: all acgeneral.m4 acspecific.m4 acconfig.h installdirs
+install: acgeneral.m4 acspecific.m4 acconfig.h installdirs
        $(INSTALL_PROGRAM) autoconf $(bindir)/autoconf
        $(INSTALL_PROGRAM) autoheader $(bindir)/autoheader
+       $(INSTALL_PROGRAM) autoreconf $(bindir)/autoreconf
        $(INSTALL_DATA) $(srcdir)/acgeneral.m4 $(acdatadir)/acgeneral.m4
        $(INSTALL_DATA) $(srcdir)/acspecific.m4 $(acdatadir)/acspecific.m4
        $(INSTALL_DATA) $(srcdir)/acconfig.h $(acdatadir)/acconfig.h
-       $(INSTALL_DATA) $(srcdir)/INSTALL $(acdatadir)/install.sh
+       -if test -f autoscan; then \
+       $(INSTALL_PROGRAM) autoscan $(bindir)/autoscan; \
+       $(INSTALL_DATA) $(srcdir)/acfunctions $(acdatadir)/acfunctions; \
+       $(INSTALL_DATA) $(srcdir)/acheaders $(acdatadir)/acheaders; \
+       $(INSTALL_DATA) $(srcdir)/acidentifiers $(acdatadir)/acidentifiers; \
+       $(INSTALL_DATA) $(srcdir)/acprograms $(acdatadir)/acprograms; \
+       $(INSTALL_DATA) $(srcdir)/acmakevars $(acdatadir)/acmakevars; \
+       else :; fi
+
+install-info: installdirs
        -if test -f autoconf.info; then d=.; else d=$(srcdir); fi; \
-       $(INSTALL_DATA) $$d/autoconf.info $(infodir)/autoconf.info
-       -if test -f standards.info; then d=.; else d=$(srcdir); fi; \
-       $(INSTALL_DATA) $$d/standards.info $(infodir)/standards.info
+       cd $$d; for i in *.info*; do \
+       $(INSTALL_DATA) $$i $(infodir)/$$i; \
+       done
 
 uninstall:
-       rm -f $(bindir)/autoconf $(bindir)/autoheader
-       cd $(acdatadir); rm -f acgeneral.m4 acspecific.m4 aclocal.m4 acconfig.h
-       -rmdir $(acdatadir)
-       cd $(infodir); rm -f autoconf.info standards.info
+       rm -f $(bindir)/autoconf $(bindir)/autoheader $(bindir)/autoscan 
+       rm -f $(bindir)/autoreconf
+       rm -fr $(acdatadir)
+       cd $(infodir); rm -f autoconf.info*
 
 configure: configure.in acgeneral.m4 acspecific.m4
        cd $(srcdir); \
@@ -113,7 +151,7 @@ config.status: configure
        ./config.status --recheck
 
 clean:
-       rm -f autoconf autoheader *.tmp
+       rm -f autoconf autoheader autoscan autoreconf *.tmp
        rm -f *.aux *.cp *.cps *.dvi *.fn *.fns *.ky *.kys *.log
        rm -f *.pg *.pgs *.toc *.tp *.tps *.vr *.vrs *.ma *.mas
 
@@ -128,16 +166,31 @@ realclean: distclean
 TAGS:
        etags ${srcdir}/*.m4 ${srcdir}/*.sh ${srcdir}/[a-z]*.in ${srcdir}/*.texi
 
-dist: Makefile $(DISTFILES)
-       echo autoconf-`sed -e '/define(AC_ACVERSION,/!d' -e 's/[^0-9.]*\([0-9.]*\).*/\1/' -e q acgeneral.m4` > .fname
-       rm -rf `cat .fname`
-       mkdir `cat .fname`
-       for file in $(DISTFILES); do \
-         ln $$file `cat .fname` \
-           || { echo copying $$file instead; cp -p $$file `cat .fname`; }; \
-       done
-       tar --gzip -chf `cat .fname`.tar.gz `cat .fname`
-       rm -rf `cat .fname` .fname
-
-# Prevent GNU make v3 from overflowing arg limit on SysV.
-.NOEXPORT:
+diststuff: $(DISTSTUFF)
+
+dist: diststuff
+       cd ../etc; ${MAKE} info
+       distname=`sed -e '/define(AC_ACVERSION,/!d' \
+       -e 's/[^0-9.]*\([0-9.]*\).*/autoconf-\1/' -e q acgeneral.m4`; \
+       cd ..; \
+       chmod -R go+rX .; \
+       rm -fr $$distname; \
+       mkdir $$distname $$distname/autoconf $$distname/etc $$distname/texinfo; \
+       for file in $(DISTROOT); do \
+         ln $$file $$distname \
+         || { echo copying $$file instead; cp -p $$file $$distname;}; \
+       done; \
+       for file in $(DISTAUTOCONF); do \
+         ln $$file $$distname/autoconf \
+         || { echo copying $$file instead; cp -p $$file $$distname/autoconf;}; \
+       done; \
+       for file in $(DISTETC); do \
+         ln $$file $$distname/etc \
+         || { echo copying $$file instead; cp -p $$file $$distname/etc;}; \
+       done; \
+       for file in $(DISTTEXINFO); do \
+         ln $$file $$distname/texinfo \
+         || { echo copying $$file instead; cp -p $$file $$distname/texinfo;}; \
+       done; \
+       tar -chz -f autoconf/$$distname.tar.gz $$distname; \
+       rm -fr $$distname

diff --git a/doc/Makefile.in b/doc/Makefile.in
index 00b4cc0aa6c09d357255e3fa1f7282699d564b12..277177d95aa768827ed869099721dc20d3ef5627 100644 (file)
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -1,5 +1,5 @@
 # Makefile for Autoconf.
-# Copyright (C) 1992, 1993 Free Software Foundation, Inc.
+# Copyright (C) 1992, 1993, 1994 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -26,6 +26,10 @@ INSTALL_DATA = @INSTALL_DATA@
 MAKEINFO = makeinfo
 TEXI2DVI = texi2dvi
 M4 = @M4@
+# Programs that we can not install if perl is missing.
+PROGS = @PROGS@
+# Path of the perl interpreter.
+PERL = @PERL@
 
 prefix = /usr/local
 exec_prefix = $(prefix)
@@ -44,14 +48,35 @@ infodir = $(prefix)/info
 
 SHELL = /bin/sh
 
-DISTFILES = README Makefile.in INSTALL NEWS COPYING ChangeLog \
-autoconf.texi acconfig.h autoconf.sh acgeneral.m4 acspecific.m4 \
-configure configure.in autoheader.sh mkinstalldirs install.sh \
-autoconf.info standards.texi make-stds.texi standards.info texinfo.tex
+# Files that can be generated, but should be in the distribution.
+DISTSTUFF = info Makefile
+# Files to distribute.
+DISTROOT = COPYING Makefile.in README \
+       config.guess config.sub configure configure.in \
+       install.sh move-if-change
+DISTAUTOCONF = autoconf/ChangeLog \
+       autoconf/INSTALL autoconf/Makefile.in autoconf/NEWS \
+       autoconf/README autoconf/acconfig.h autoconf/acfunctions \
+       autoconf/acgeneral.m4 autoconf/acheaders autoconf/acidentifiers \
+       autoconf/acmakevars autoconf/acprograms autoconf/acspecific.m4 \
+       autoconf/autoconf.sh autoconf/autoconf.texi \
+       autoconf/autoheader.sh autoconf/autoscan.pl autoconf/autoreconf.sh \
+       autoconf/configure autoconf/configure.in autoconf/mkinstalldirs \
+       autoconf/autoconf.info*
+
+DISTETC = etc/Makefile.in \
+       etc/cfg-paper.texi etc/configure.in etc/configure.man \
+       etc/configure.texi etc/standards.texi etc/make-stds.texi \
+       etc/cfg-paper.info* etc/configure.info* etc/standards.info*
+DISTTEXINFO = texinfo/tex3patch texinfo/texinfo.tex
+
+# Where to find texinfo.tex to format documentation with TeX.
+TEXIDIR = $(srcdir)/../texinfo
 
 editsh = sed -e 's,@''datadir''@,$(acdatadir),g' -e 's,@''M4''@,$(M4),g'
+editpl = sed -e 's,@''datadir''@,$(acdatadir),g' -e 's,@''PERL''@,$(PERL),g'
 
-all: autoconf autoheader autoconf.info standards.info
+all: autoconf autoheader ${PROGS}
 
 autoconf: autoconf.sh
        rm -f $@ $@.tmp
@@ -61,45 +86,58 @@ autoheader: autoheader.sh
        rm -f $@ $@.tmp
        $(editsh) $(srcdir)/autoheader.sh > $@.tmp && mv $@.tmp $@ && chmod +x $@
 
-info: autoconf.info standards.info
+autoreconf: autoreconf.sh
+       rm -f $@ $@.tmp
+       $(editsh) $(srcdir)/autoreconf.sh > $@.tmp && mv $@.tmp $@ && chmod +x $@
 
-autoconf.info: autoconf.texi
-       $(MAKEINFO) -I$(srcdir) $(srcdir)/autoconf.texi --no-split --output=$@
+autoscan: autoscan.pl
+       rm -f $@ $@.tmp
+       $(editpl) $(srcdir)/autoscan.pl > $@.tmp && mv $@.tmp $@ && chmod +x $@
 
-standards.info: standards.texi make-stds.texi
-       $(MAKEINFO) -I$(srcdir) $(srcdir)/standards.texi --no-split --output=$@
+info: autoconf.info
 
-dvi: autoconf.dvi standards.dvi
+autoconf.info: autoconf.texi
+       $(MAKEINFO) -I$(srcdir) $(srcdir)/autoconf.texi --output=$@
 
-autoconf.dvi: autoconf.texi
-       $(TEXI2DVI) $(srcdir)/autoconf.texi
+dvi: autoconf.dvi
 
-standards.dvi: standards.texi make-stds.texi
-       $(TEXI2DVI) $(srcdir)/standards.texi
+autoconf.dvi: autoconf.texi
+       TEXINPUTS=$(TEXIDIR):$$TEXINPUTS $(TEXI2DVI) $(srcdir)/autoconf.texi
 
 check:
+installcheck:
 
-installdirs:
+installdirs: mkinstalldirs $(bindir) $(infodir) $(acdatadir)
        $(SHELL) ${srcdir}/mkinstalldirs $(bindir) $(infodir) $(acdatadir)
 
 # References to install-info have been removed until it's released.
-install: all acgeneral.m4 acspecific.m4 acconfig.h installdirs
+install: acgeneral.m4 acspecific.m4 acconfig.h installdirs
        $(INSTALL_PROGRAM) autoconf $(bindir)/autoconf
        $(INSTALL_PROGRAM) autoheader $(bindir)/autoheader
+       $(INSTALL_PROGRAM) autoreconf $(bindir)/autoreconf
        $(INSTALL_DATA) $(srcdir)/acgeneral.m4 $(acdatadir)/acgeneral.m4
        $(INSTALL_DATA) $(srcdir)/acspecific.m4 $(acdatadir)/acspecific.m4
        $(INSTALL_DATA) $(srcdir)/acconfig.h $(acdatadir)/acconfig.h
-       $(INSTALL_DATA) $(srcdir)/INSTALL $(acdatadir)/install.sh
+       -if test -f autoscan; then \
+       $(INSTALL_PROGRAM) autoscan $(bindir)/autoscan; \
+       $(INSTALL_DATA) $(srcdir)/acfunctions $(acdatadir)/acfunctions; \
+       $(INSTALL_DATA) $(srcdir)/acheaders $(acdatadir)/acheaders; \
+       $(INSTALL_DATA) $(srcdir)/acidentifiers $(acdatadir)/acidentifiers; \
+       $(INSTALL_DATA) $(srcdir)/acprograms $(acdatadir)/acprograms; \
+       $(INSTALL_DATA) $(srcdir)/acmakevars $(acdatadir)/acmakevars; \
+       else :; fi
+
+install-info: installdirs
        -if test -f autoconf.info; then d=.; else d=$(srcdir); fi; \
-       $(INSTALL_DATA) $$d/autoconf.info $(infodir)/autoconf.info
-       -if test -f standards.info; then d=.; else d=$(srcdir); fi; \
-       $(INSTALL_DATA) $$d/standards.info $(infodir)/standards.info
+       cd $$d; for i in *.info*; do \
+       $(INSTALL_DATA) $$i $(infodir)/$$i; \
+       done
 
 uninstall:
-       rm -f $(bindir)/autoconf $(bindir)/autoheader
-       cd $(acdatadir); rm -f acgeneral.m4 acspecific.m4 aclocal.m4 acconfig.h
-       -rmdir $(acdatadir)
-       cd $(infodir); rm -f autoconf.info standards.info
+       rm -f $(bindir)/autoconf $(bindir)/autoheader $(bindir)/autoscan 
+       rm -f $(bindir)/autoreconf
+       rm -fr $(acdatadir)
+       cd $(infodir); rm -f autoconf.info*
 
 configure: configure.in acgeneral.m4 acspecific.m4
        cd $(srcdir); \
@@ -113,7 +151,7 @@ config.status: configure
        ./config.status --recheck
 
 clean:
-       rm -f autoconf autoheader *.tmp
+       rm -f autoconf autoheader autoscan autoreconf *.tmp
        rm -f *.aux *.cp *.cps *.dvi *.fn *.fns *.ky *.kys *.log
        rm -f *.pg *.pgs *.toc *.tp *.tps *.vr *.vrs *.ma *.mas
 
@@ -128,16 +166,31 @@ realclean: distclean
 TAGS:
        etags ${srcdir}/*.m4 ${srcdir}/*.sh ${srcdir}/[a-z]*.in ${srcdir}/*.texi
 
-dist: Makefile $(DISTFILES)
-       echo autoconf-`sed -e '/define(AC_ACVERSION,/!d' -e 's/[^0-9.]*\([0-9.]*\).*/\1/' -e q acgeneral.m4` > .fname
-       rm -rf `cat .fname`
-       mkdir `cat .fname`
-       for file in $(DISTFILES); do \
-         ln $$file `cat .fname` \
-           || { echo copying $$file instead; cp -p $$file `cat .fname`; }; \
-       done
-       tar --gzip -chf `cat .fname`.tar.gz `cat .fname`
-       rm -rf `cat .fname` .fname
-
-# Prevent GNU make v3 from overflowing arg limit on SysV.
-.NOEXPORT:
+diststuff: $(DISTSTUFF)
+
+dist: diststuff
+       cd ../etc; ${MAKE} info
+       distname=`sed -e '/define(AC_ACVERSION,/!d' \
+       -e 's/[^0-9.]*\([0-9.]*\).*/autoconf-\1/' -e q acgeneral.m4`; \
+       cd ..; \
+       chmod -R go+rX .; \
+       rm -fr $$distname; \
+       mkdir $$distname $$distname/autoconf $$distname/etc $$distname/texinfo; \
+       for file in $(DISTROOT); do \
+         ln $$file $$distname \
+         || { echo copying $$file instead; cp -p $$file $$distname;}; \
+       done; \
+       for file in $(DISTAUTOCONF); do \
+         ln $$file $$distname/autoconf \
+         || { echo copying $$file instead; cp -p $$file $$distname/autoconf;}; \
+       done; \
+       for file in $(DISTETC); do \
+         ln $$file $$distname/etc \
+         || { echo copying $$file instead; cp -p $$file $$distname/etc;}; \
+       done; \
+       for file in $(DISTTEXINFO); do \
+         ln $$file $$distname/texinfo \
+         || { echo copying $$file instead; cp -p $$file $$distname/texinfo;}; \
+       done; \
+       tar -chz -f autoconf/$$distname.tar.gz $$distname; \
+       rm -fr $$distname