* tests/subdircond3.test: Pass flags to make in environment.

	* tests/subdircond2.test: Pass flags to make in environment.
	* Makefile.am (maintainer-check): Add a new check for @...@
	substitutions.  Updated correct number of diffs between source and
	build trees.

diff --git a/ChangeLog b/ChangeLog
index d1a1528bbde9663d679de6c6eeb0d0515595c15f..b3a366a10f41e4ce2254c3cfa94850bcf25bc2bf 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2002-09-15  Tom Tromey  <tromey@redhat.com>
 
+       * tests/subdircond3.test: Pass flags to make in environment.
+       * tests/subdircond2.test: Pass flags to make in environment.
+       * Makefile.am (maintainer-check): Add a new check for @...@
+       substitutions.  Updated correct number of diffs between source and
+       build trees.
+
        * configure.in (aclocal, automake): Don't create.
        * automake.in ($prefix): Don't define.
        * aclocal.in ($prefix): Don't define.

diff --git a/Makefile.am b/Makefile.am
index c8197874813f8b1203fbf9cc993d4b0bb93c8265..488b4553ec911a97ce4271cbe28f73554e022072 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -87,7 +87,7 @@ maintainer-check: automake aclocal
 ## This check avoids accidental configure substitutions in the source.
 ## There are exactly 7 lines that should be modified.  This works out
 ## to 22 lines of diffs.
-       @if test `diff $(srcdir)/automake.in automake | wc -l` -ne 28; then \
+       @if test `diff $(srcdir)/automake.in automake | wc -l` -ne 24; then \
          echo "found too many diffs between automake.in and automake"; 1>&2; \
          diff -c $(srcdir)/automake.in automake; \
          exit 1; \
@@ -241,6 +241,17 @@ maintainer-check: automake aclocal
          echo 'Do not use egrep or fgrep in the above files, they are not portable.' 1>&2; \
          exit 1; \
        fi
+## Try to make sure all @...@ substitutions are covered by our
+## substitution rule.
+       @if test `grep -E '@[A-Za-z_0-9]+@' aclocal | wc -l` -ne 0; then \
+         echo "Unresolved @...@ substitution in aclocal" 1>&2; \
+         exit 1; \
+       fi
+## In automake there are a few valid ones.
+       @if test `grep -E '@[A-Za-z_0-9]+@' automake | wc -l` -ne 4; then \
+         echo "Unresolved @...@ substitution in aclocal" 1>&2; \
+         exit 1; \
+       fi
 
 
 # Tag before making distribution.  Also, don't make a distribution if

diff --git a/Makefile.in b/Makefile.in
index 5b0c8b2af3fd0f643123ea44937ea68fbe8fbcee..2066414f52edfabce9e1cda85e46f9118bdbd5b3 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -181,6 +181,24 @@ uninstall-binSCRIPTS:
          echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
          rm -f $(DESTDIR)$(bindir)/$$f; \
        done
+
+.texi.info:
+       @rm -f $@ $@-[0-9] $@-[0-9][0-9]
+       $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \
+       `test -f '$<' || echo '$(srcdir)/'`$< -o $@
+
+.texi.dvi:
+       TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
+       MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \
+       $(TEXI2DVI) `test -f '$<' || echo '$(srcdir)/'`$<
+
+.texi.pdf:
+       TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
+       MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \
+       $(TEXI2PDF) `test -f '$<' || echo '$(srcdir)/'`$<
+automake.info: version.texi
+automake.dvi: version.texi
+automake.pdf: version.texi
 version.texi:  stamp-vti
 stamp-vti: automake.texi $(top_srcdir)/configure.in
        @(dir=.; test -f ./automake.texi || dir=$(srcdir); \
@@ -200,27 +218,9 @@ mostlyclean-vti:
 
 maintainer-clean-vti:
        -rm -f stamp-vti version.texi
-
-.texi.info:
-       @rm -f $@ $@-[0-9] $@-[0-9][0-9]
-       $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \
-       `test -f '$<' || echo '$(srcdir)/'`$< -o $@
-
-.texi.dvi:
-       TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
-       MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \
-       $(TEXI2DVI) `test -f '$<' || echo '$(srcdir)/'`$< -o $@
-
-.texi.pdf:
-       TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
-       MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \
-       $(TEXI2PDF) `test -f '$<' || echo '$(srcdir)/'`$< -o $@
-automake.info: version.texi
-automake.dvi: version.texi
-automake.pdf: version.texi
 TEXI2DVI = texi2dvi
 
-TEXI2PDF = $(TEXI2DVI) --pdf
+TEXI2PDF = $(TEXI2DVI) --pdf --batch
 DVIPS = dvips
 .dvi.ps:
        $(DVIPS) $< -o $@
@@ -247,7 +247,7 @@ uninstall-info-am:
 dist-info: $(INFO_DEPS)
        list='$(INFO_DEPS)'; \
        for base in $$list; do \
-         d=$(srcdir); \
+         if test -f $$base; then d=.; else d=$(srcdir); fi; \
          for file in $$d/$$base*; do \
            relfile=`expr "$$file" : "$$d/\(.*\)"`; \
            test -f $(distdir)/$$relfile || \
@@ -257,12 +257,12 @@ dist-info: $(INFO_DEPS)
 
 mostlyclean-aminfo:
        -rm -f automake.aux automake.cm automake.cp automake.cps automake.cv \
-         automake.dvi automake.fn automake.ky automake.log automake.op \
-         automake.ov automake.pdf automake.pg automake.ps automake.tmp \
-         automake.toc automake.tp automake.tr automake.vr automake.vrs
+         automake.fn automake.ky automake.log automake.op automake.ov \
+         automake.pg automake.tmp automake.toc automake.tp automake.tr \
+         automake.vr automake.vrs automake.dvi automake.pdf \
+         automake.ps
 
 maintainer-clean-aminfo:
-       cd $(srcdir) && \
        list='$(INFO_DEPS)'; for i in $$list; do \
          rm -f $$i; \
          if test "`echo $$i-[0-9]*`" != "$$i-[0-9]*"; then \
@@ -404,7 +404,11 @@ distdir: $(DISTFILES)
        $(am__remove_distdir)
        mkdir $(distdir)
        $(mkinstalldirs) $(distdir)/m4 $(distdir)/tests
-       @list='$(DISTFILES)'; for file in $$list; do \
+       @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+       list='$(DISTFILES)'; for file in $$list; do \
+         case $$file in \
+           $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+         esac; \
          if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
          dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
          if test "$$dir" != "$$file" && test "$$dir" != "."; then \
@@ -489,7 +493,7 @@ distcheck: dist
               && (test `find "$$dc_destdir" -type f -print | wc -l` -le 1 \
                   || { echo "ERROR: files left after uninstall (check DESTDIR support):" ; \
                        find "$$dc_destdir" -type f -print ; \
-                       exit 1; } >&2 ) \
+                       exit 1; } >&2 ); \
              } || { rm -rf "$$dc_destdir"; exit 1; }) \
          && rm -rf "$$dc_destdir" \
          && $(MAKE) $(AM_MAKEFLAGS) dist-gzip \
@@ -567,7 +571,7 @@ install-info-am: $(INFO_DEPS)
        $(mkinstalldirs) $(DESTDIR)$(infodir)
        @list='$(INFO_DEPS)'; \
        for file in $$list; do \
-         d=$(srcdir); \
+         if test -f $$file; then d=.; else d=$(srcdir); fi; \
          for ifile in echo $$d/$$file $$d/$$file-[0-9] $$d/$$file-[0-9][0-9]; do \
            if test -f $$ifile; then \
              relfile=`expr "$$ifile" : "$$d/\(.*\)"`; \
@@ -663,7 +667,7 @@ aclocal: aclocal.in Makefile
 # Some simple checks, and then ordinary check.  These are only really
 # guaranteed to work on my machine.
 maintainer-check: automake aclocal
-       @if test `diff $(srcdir)/automake.in automake | wc -l` -ne 28; then \
+       @if test `diff $(srcdir)/automake.in automake | wc -l` -ne 24; then \
          echo "found too many diffs between automake.in and automake"; 1>&2; \
          diff -c $(srcdir)/automake.in automake; \
          exit 1; \
@@ -787,6 +791,14 @@ maintainer-check: automake aclocal
          echo 'Do not use egrep or fgrep in the above files, they are not portable.' 1>&2; \
          exit 1; \
        fi
+       @if test `grep -E '@[A-Za-z_0-9]+@' aclocal | wc -l` -ne 0; then \
+         echo "Unresolved @...@ substitution in aclocal" 1>&2; \
+         exit 1; \
+       fi
+       @if test `grep -E '@[A-Za-z_0-9]+@' automake | wc -l` -ne 4; then \
+         echo "Unresolved @...@ substitution in aclocal" 1>&2; \
+         exit 1; \
+       fi
 
 # Tag before making distribution.  Also, don't make a distribution if
 # checks fail.  Also, make sure the NEWS file is up-to-date.

diff --git a/tests/subdircond2.test b/tests/subdircond2.test
index 2c25cb35e93ecda7f05f1ee292a017b97bc91ce2..89303a8b6db8c2ff48ef44b172e4fa940d9dced5 100755 (executable)
--- a/tests/subdircond2.test
+++ b/tests/subdircond2.test
@@ -91,5 +91,5 @@ $AUTOMAKE --add-missing
 ./configure
 $MAKE distcheck
 test -f sanity1
-$MAKE DISTCHECK_CONFIGURE_FLAGS=want_opt=yes distcheck
+DISTCHECK_CONFIGURE_FLAGS=want_opt=yes $MAKE distcheck
 test -f sanity2

diff --git a/tests/subdircond3.test b/tests/subdircond3.test
index 4d9b397672c2947f4f263387cffe22b0d269f10b..1ba3884628f0ea6d4da9b47768f9938ec2cc6045 100755 (executable)
--- a/tests/subdircond3.test
+++ b/tests/subdircond3.test
@@ -92,5 +92,5 @@ $AUTOMAKE --add-missing
 ./configure
 $MAKE distcheck
 test -f sanity1
-$MAKE DISTCHECK_CONFIGURE_FLAGS=want_opt=yes distcheck
+DISTCHECK_CONFIGURE_FLAGS=want_opt=yes $MAKE distcheck
 test -f sanity2