test fixlet

diff --git a/Makefile.in b/Makefile.in
index 38dacf605d709399f96f682c0e2a67f5b5ad7ae5..98821d9e2e56a9f22b663327c86539329bc1559e 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -110,7 +110,7 @@ GZIP = --best
 default: all
 
 .SUFFIXES:
-.SUFFIXES: .texi .texinfo .info .dvi .ps
+.SUFFIXES: .dvi .info .ps .texi .texinfo
 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
        cd $(top_srcdir) && $(AUTOMAKE) --gnits Makefile
 
@@ -118,12 +118,12 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
        cd $(top_builddir) \
          && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
-$(srcdir)/aclocal.m4:  configure.in 
+$(ACLOCAL_M4):  configure.in 
        cd $(srcdir) && $(ACLOCAL)
 
-config.status: configure
+config.status: $(srcdir)/configure
        $(SHELL) ./config.status --recheck
-$(srcdir)/configure: configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
+$(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
        cd $(srcdir) && $(AUTOCONF)
 automake: $(top_builddir)/config.status automake.in
        cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= ./config.status
@@ -387,10 +387,10 @@ distdir: $(DISTFILES)
        fi
        rm -rf $(distdir)
        mkdir $(distdir)
-       -chmod 755 $(distdir)
-       here=`pwd`; distdir=`cd $(distdir) && pwd` \
-         && cd $(srcdir) \
-         && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(srcdir) --output-dir=$$distdir --gnits
+       -chmod 777 $(distdir)
+       here=`cd $(top_builddir) && pwd`; top_distdir=`cd $$top_distdir && pwd` \
+         && cd $(top_srcdir) \
+         && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnits Makefile
        @for file in $(DISTFILES); do \
          d=$(srcdir); \
          test -f $(distdir)/$$file \
@@ -401,17 +401,17 @@ distdir: $(DISTFILES)
          test -d $(distdir)/$$subdir           \
          || mkdir $(distdir)/$$subdir          \
          || exit 1;                            \
-         chmod 755 $(distdir)/$$subdir;        \
-         (cd $$subdir && $(MAKE) distdir=../$(distdir)/$$subdir distdir) \
+         chmod 777 $(distdir)/$$subdir;        \
+         (cd $$subdir && $(MAKE) top_distdir=$(top_distdir) distdir=../$(distdir)/$$subdir distdir) \
            || exit 1; \
        done
-       $(MAKE) distdir="$(distdir)" dist-info
+       $(MAKE) top_distdir="$(distdir)" distdir="$(distdir)" dist-info
 info: $(INFO_DEPS) info-recursive
 dvi: $(DVIS) dvi-recursive
 check: all-am
        $(MAKE) check-recursive
 installcheck: installcheck-recursive installcheck-local
-all-am: $(INFO_DEPS) $(SCRIPTS) $(DATA) Makefile
+all-am: Makefile $(INFO_DEPS) $(SCRIPTS) $(DATA)
 
 install-exec-am: install-binSCRIPTS
 

diff --git a/TODO b/TODO
index b7eef500e4f185e493529b6d52ee33abbe6e61f9..e267fbe21860f0ada3155015104e4763ddf0f910 100644 (file)
--- a/TODO
+++ b/TODO
@@ -27,6 +27,8 @@
   file into the .deps directory.  That is, create the dependencies
   as a side effect of compilation
   This still won't solve the file-deletion problem
+  [ also: jim makes distributions by checking out, configuring,
+    and running "make dist".  This scheme would cause that to fail ]
 
 * copyrights on m4 files, aclocal output
 
@@ -67,6 +69,7 @@ rewrite in guile (RMS request)
 at the same time, consider adding a GUI
 could use the same parsing code for the GUI and the standalone version
 that means figuring out a better representation of internal state
+[ that's easy -- anything is better than what we have now ]
 
 having just one Makefile for a project would give a big speed increase
 for a project with many directories, eg glibc.  ideally (?) you'd

diff --git a/m4/Makefile.in b/m4/Makefile.in
index 0d4d842cca03a67bb7ce53df823a84c9f20f9dab..989ed117729c5ae0a4e990d35323b463f4efff30 100644 (file)
--- a/m4/Makefile.in
+++ b/m4/Makefile.in
@@ -116,6 +116,9 @@ distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
 
 subdir = m4
 distdir: $(DISTFILES)
+       here=`cd $(top_builddir) && pwd`; top_distdir=`cd $$top_distdir && pwd` \
+         && cd $(top_srcdir) \
+         && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnits m4/Makefile
        @for file in $(DISTFILES); do \
          d=$(srcdir); \
          test -f $(distdir)/$$file \

diff --git a/tests/ChangeLog b/tests/ChangeLog
index 0fdc6918a86e7dc39fb460d7ed36af5f704f154e..16a66405a509ce9dc0297f550009afc465301b7b 100644 (file)
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,7 @@
+Sun Apr 27 21:07:49 1997  Tom Tromey  <tromey@cygnus.com>
+
+       * confsub.test: Fixed bug.
+
 Fri Apr 25 12:30:22 1997  Tom Tromey  <tromey@cygnus.com>
 
        * conf2.test: New file.

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 388d4e38bbae95158733fd2551c878851a3bc94c..89d3e995dc267511dc139925331ada3f62144e1d 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -113,6 +113,9 @@ distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
 
 subdir = tests
 distdir: $(DISTFILES)
+       here=`cd $(top_builddir) && pwd`; top_distdir=`cd $$top_distdir && pwd` \
+         && cd $(top_srcdir) \
+         && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnits tests/Makefile
        @for file in $(DISTFILES); do \
          d=$(srcdir); \
          test -f $(distdir)/$$file \

diff --git a/tests/confsub.test b/tests/confsub.test
index 38e8e7f4cb8af523801427db84a2aebda5128a6b..8108309d31e3125d5d7382f5ce1ed8dd7d36dd93 100755 (executable)
--- a/tests/confsub.test
+++ b/tests/confsub.test
@@ -29,6 +29,5 @@ END
 $AUTOMAKE || exit 1
 
 # Make sure subdir Makefile.in doesn't itself look in the subdir.
-(grep 'subdir/config.h' subdir/Makefile.in | grep -v CONFIG_HEADER_FULL) \
-   && exit 1
+(grep 'subdir/config.h' subdir/Makefile.in | grep -v CONFIG_HEADERS) && exit 1
 exit 0