* Makefile.maint (AUTOM4TE): Neutralize autom4te.

Suggested by Jim Meyering.

diff --git a/ChangeLog b/ChangeLog
index 25743b227ff1102d9f4e3cc20ebb8a5ed0ec4eed..bbbe77b2f00186cca48993e3bf0085c323b5c1b2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-09-21  Akim Demaille  <akim@epita.fr>
+
+       * Makefile.maint (AUTOM4TE): Neutralize autom4te.
+       Suggested by Jim Meyering.
+
 2001-09-20  Tim Van Holder  <tim.van.holder@pandora.be>
 
        * lib/autoconf/programs.m4: Use extensions listed in

diff --git a/Makefile.maint b/Makefile.maint
index cd06976f3b538736dc1d96967df02bd17a874235..cedb9de3b9eec22c3abe3501539fe1604c5344b8 100644 (file)
--- a/Makefile.maint
+++ b/Makefile.maint
@@ -222,6 +222,7 @@ cvs-dist: local-check cvs-check maintainer-distcheck
 null_AM_MAKEFLAGS = \
   ACLOCAL=false \
   AUTOCONF=false \
+  AUTOM4TE=false \
   AUTOMAKE=false \
   AUTOHEADER=false \
   MAKEINFO=false

diff --git a/man/Makefile.in b/man/Makefile.in
index 7fa3ba0b624395dd2323bd99ff6de417c936d512..55642e1662cebebeea330cb662394289b306cabb 100644 (file)
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -255,10 +255,12 @@ config.sub.1:   $(srcdir)/config.sub.x    $(top_srcdir)/config/config.sub
 
 .x.1:
        echo "Updating man page $@"
-       PATH=$(top_builddir)/bin:$(top_srcdir)/config:$$PATH ;\
-       export PATH ;\
-       autom4te_perllibdir=$(top_srcdir)/lib;\
+       PATH="$(top_builddir)/bin@PATH_SEPARATOR@$(top_srcdir)/config@PATH_SEPARATOR@$$PATH"; \
+       export PATH; \
+       autom4te_perllibdir=$(top_srcdir)/lib; \
        export autom4te_perllibdir; \
+       AUTOM4TE_CFG=$(top_srcdir)/lib/autom4te.cfg; \
+       export AUTOM4TE_CFG; \
        $(HELP2MAN) \
            --include=$(srcdir)/$*.x \
            --include=$(srcdir)/common.x \

diff --git a/man/autoconf.1 b/man/autoconf.1
index 13e5368a9d369b9112765c993f32bbc1a455d330..4b3b3435bb6558b1ce44cfdc72cece60e6799b61 100644 (file)
--- a/man/autoconf.1
+++ b/man/autoconf.1
@@ -25,10 +25,10 @@ verbosely report processing
 don't remove temporary files
 .TP
 \fB\-I\fR, \fB\-\-include\fR=\fIDIR\fR
-look for input files in DIR.  Accumulates
+look for input files in DIR (cumulative)
 .TP
 \fB\-f\fR, \fB\-\-force\fR
-consider all the files are obsolete
+consider all files obsolete
 .TP
 \fB\-o\fR, \fB\-\-output\fR=\fIFILE\fR
 save output in FILE (stdout is the default)

diff --git a/man/autoheader.1 b/man/autoheader.1
index a9b670f4c0c34aea0060246a193d536dd13dc939..c47c5c49fb01514ee244d6ae80548fd62a14f0fc 100644 (file)
--- a/man/autoheader.1
+++ b/man/autoheader.1
@@ -23,10 +23,10 @@ verbosely report processing
 don't remove temporary files
 .TP
 \fB\-I\fR, \fB\-\-include\fR=\fIDIR\fR
-look for input files in DIR.  Accumulates
+look for input files in DIR (cumulative)
 .TP
 \fB\-f\fR, \fB\-\-force\fR
-consider all the files are obsolete
+consider all files obsolete
 .TP
 \fB\-W\fR, \fB\-\-warnings\fR=\fICATEGORY\fR
 report the warnings falling in CATEGORY

diff --git a/man/autom4te.1 b/man/autom4te.1
index 22849e3d08c15b87b78851641d953975caf555c2..d161a939f9fad1229b1eada473b2ffcc2f990757 100644 (file)
--- a/man/autom4te.1
+++ b/man/autom4te.1
@@ -86,7 +86,7 @@ The environment variable `WARNINGS' is honored.
 .SS "Library directories:"
 .TP
 \fB\-I\fR, \fB\-\-include\fR=\fIDIR\fR
-look for FILES in DIR.  Several invocations accumulate
+look for FILES in DIR (cumulative)
 .SS "Tracing:"
 .TP
 \fB\-t\fR, \fB\-\-trace\fR=\fIMACRO\fR

diff --git a/man/autoreconf.1 b/man/autoreconf.1
index f37b660c59305264a3a6c359957c2ac760d25064..17b380d1f4ec39e0e5ac18da40ec92edafa5ab79 100644 (file)
--- a/man/autoreconf.1
+++ b/man/autoreconf.1
@@ -28,7 +28,7 @@ verbosely report processing
 don't remove temporary files
 .TP
 \fB\-f\fR, \fB\-\-force\fR
-consider all the files are obsolete
+consider all files obsolete
 .TP
 \fB\-i\fR, \fB\-\-install\fR
 copy missing auxiliary files
@@ -41,7 +41,7 @@ other tools.
 .SS "Library directories:"
 .TP
 \fB\-A\fR, \fB\-\-autoconf\-dir\fR=\fIACDIR\fR
-Autoconf's macro files location (rarely needed)
+location of Autoconf's macro files (rarely needed)
 .TP
 \fB\-l\fR, \fB\-\-localdir\fR=\fIDIR\fR
 location of `aclocal.m4' and `acconfig.h'

diff --git a/man/autoscan.1 b/man/autoscan.1
index eefcc48a98306d4af4b20dee001570ed99b30220..eb005543b8ff091eb8f7c6ddc865389dc5dd60e3 100644 (file)
--- a/man/autoscan.1
+++ b/man/autoscan.1
@@ -25,7 +25,7 @@ verbosely report processing
 don't remove temporary files
 .TP
 \fB\-I\fR, \fB\-\-include\fR=\fIDIR\fR
-look for input files in DIR.  Accumulates
+look for input files in DIR (cumulative)
 .SH AUTHOR
 Written by David J. MacKenzie.
 .PP

diff --git a/man/autoupdate.1 b/man/autoupdate.1
index 45b1df6fb208f0f94152e2dec9532d1c5b1949c7..2d4073b858a354d4032af8864a426f37b2ab1bc9 100644 (file)
--- a/man/autoupdate.1
+++ b/man/autoupdate.1
@@ -24,10 +24,10 @@ verbosely report processing
 don't remove temporary files
 .TP
 \fB\-I\fR, \fB\-\-include\fR=\fIDIR\fR
-look for input files in DIR.  Accumulates
+look for input files in DIR (cumulative)
 .TP
 \fB\-f\fR, \fB\-\-force\fR
-consider all the files are obsolete
+consider all files obsolete
 .SH AUTHOR
 Written by David J. MacKenzie and Akim Demaille.
 .PP