* distdir.am: Add a missing backslash.

diff --git a/ChangeLog b/ChangeLog
index ee1c9e950e7e78671add08496b5c69223076a9d0..900d4c5856cc0751965b8ab84f5c84bf8e220e29 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2001-04-10  Akim Demaille  <akim@epita.fr>
+
+       * distdir.am: Add a missing backslash.
+
 2001-04-10  Akim Demaille  <akim@epita.fr>
 
        * automake.in (&scan_aclocal_m4): Handle $relative_dir and special
@@ -5,9 +9,10 @@
        Specify to the caller whether $regen_aclocal_m4.
        (&handle_configure): Adjust.
        Transform `REGEN-ACLOCAL-M4'.
+       Reported by Tom.
        * configure.am: Use it.
        * tests/defs (me): New.
-       * tests/configdeps.test: New.
+       * tests/confdeps.test: New.
 
 2001-04-09  Tom Tromey  <tromey@redhat.com>
 

diff --git a/Makefile.in b/Makefile.in
index e18e2ea3365e57acd12440a7a4a3875321d88875..bd776f30956bdc1b645e7507b5767fa4cf8765a6 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -59,8 +59,6 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-
-@SET_MAKE@
 AMDEP = @AMDEP@
 AMTAR = @AMTAR@
 AWK = @AWK@
@@ -135,12 +133,12 @@ RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \
        install-exec-recursive installdirs-recursive install-recursive \
        uninstall-recursive check-recursive installcheck-recursive
 DIST_COMMON = README $(dist_pkgdata_DATA) $(dist_script_DATA) AUTHORS \
-COPYING ChangeLog INSTALL Makefile.am Makefile.in NEWS README-alpha \
-THANKS TODO aclocal.in aclocal.m4 ansi2knr.1 ansi2knr.c automake.in \
-compile config.guess config.sub configure configure.in depcomp \
-elisp-comp install-sh mdate-sh missing mkinstalldirs py-compile \
-stamp-vti texinfo.tex version.texi ylwrap
-
+       COPYING ChangeLog INSTALL Makefile.am Makefile.in NEWS \
+       README-alpha THANKS TODO aclocal.in aclocal.m4 ansi2knr.1 \
+       ansi2knr.c automake.in compile config.guess config.sub \
+       configure configure.in depcomp elisp-comp install-sh mdate-sh \
+       missing mkinstalldirs py-compile stamp-vti texinfo.tex \
+       version.texi ylwrap
 DIST_SUBDIRS = $(SUBDIRS)
 all: all-recursive
 
@@ -155,13 +153,15 @@ Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
        cd $(top_builddir) && \
          CONFIG_HEADERS= CONFIG_LINKS= \
          CONFIG_FILES=$@ $(SHELL) ./config.status
-$(ACLOCAL_M4): configure.in 
-       cd $(srcdir) && $(ACLOCAL)
 
 config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
        $(SHELL) ./config.status --recheck
+
 $(srcdir)/configure:  $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
        cd $(srcdir) && $(AUTOCONF)
+
+$(ACLOCAL_M4):  configure.in 
+       cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 automake: $(top_builddir)/config.status automake.in
        cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= CONFIG_LINKS= $(SHELL) ./config.status
 aclocal: $(top_builddir)/config.status aclocal.in
@@ -378,9 +378,9 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
        tags=; \
        here=`pwd`; \
        list='$(SUBDIRS)'; for subdir in $$list; do \
-   if test "$$subdir" = .; then :; else \
+         if test "$$subdir" = .; then :; else \
            test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
-   fi; \
+         fi; \
        done; \
        list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \
        unique=`for i in $$list; do \
@@ -450,6 +450,7 @@ distdir: $(DISTFILES)
 dist: distdir
        $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
        -chmod -R a+w $(distdir) >/dev/null 2>&1; rm -rf $(distdir)
+
 # This target untars the dist file and tries a VPATH configuration.  Then
 # it guarantees that the distribution is self-contained by making another
 # tarfile.

diff --git a/distdir.am b/distdir.am
index a8db873c702b563ebe25c7d25ad829503a9f8593..9dbc8dd7c8cdcb612306fd56916304cd2f791f98 100644 (file)
--- a/distdir.am
+++ b/distdir.am
@@ -31,7 +31,7 @@ distdir: $(DISTFILES)
 ##
 if %?TOPDIR_P%
 if  %?CK-NEWS%
-       @if sed 15q $(srcdir)/NEWS | fgrep -e "$(VERSION)" >/dev/null;
+       @if sed 15q $(srcdir)/NEWS | fgrep -e "$(VERSION)" >/dev/null; \
        then :; else \
          echo "NEWS not updated; not releasing" 1>&2; \
          exit 1; \

diff --git a/lib/am/distdir.am b/lib/am/distdir.am
index a8db873c702b563ebe25c7d25ad829503a9f8593..9dbc8dd7c8cdcb612306fd56916304cd2f791f98 100644 (file)
--- a/lib/am/distdir.am
+++ b/lib/am/distdir.am
@@ -31,7 +31,7 @@ distdir: $(DISTFILES)
 ##
 if %?TOPDIR_P%
 if  %?CK-NEWS%
-       @if sed 15q $(srcdir)/NEWS | fgrep -e "$(VERSION)" >/dev/null;
+       @if sed 15q $(srcdir)/NEWS | fgrep -e "$(VERSION)" >/dev/null; \
        then :; else \
          echo "NEWS not updated; not releasing" 1>&2; \
          exit 1; \

diff --git a/m4/Makefile.in b/m4/Makefile.in
index ed0120614d1c0c3037b8ba37dec02c4831d17434..8e8556d6c5820f487f37260ac0a5ef380ae2f45e 100644 (file)
--- a/m4/Makefile.in
+++ b/m4/Makefile.in
@@ -59,8 +59,6 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-
-@SET_MAKE@
 AMDEP = @AMDEP@
 AMTAR = @AMTAR@
 AWK = @AWK@
@@ -96,7 +94,6 @@ DIST_SOURCES =
 DATA = $(m4data_DATA)
 
 DIST_COMMON = Makefile.am Makefile.in
-
 all: all-am
 
 .SUFFIXES:

diff --git a/tests/confdeps.test b/tests/confdeps.test
new file mode 100755 (executable)
index 0000000..e6763f2
--- /dev/null
+++ b/tests/confdeps.test
@@ -0,0 +1,21 @@
+#! /bin/sh
+
+# Make sure that config* files are properly regenerated.
+
+. $srcdir/defs || exit 1
+
+echo "FOO = foo"        > Makefile.am
+set -e
+
+echo "$me: Not generated by aclocal..."
+echo "Hello, universe!" > aclocal.m4
+$AUTOMAKE
+grep '^\$(ACLOCAL_M4):' Makefile.in && exit 1
+
+
+echo "$me: Generated by aclocal..."
+$ACLOCAL
+$AUTOMAKE
+grep '^\$(ACLOCAL_M4):' Makefile.in
+
+exit 0