Another bug fix

diff --git a/ChangeLog b/ChangeLog
index f94d2568cabccfe20765af29a00cbe7dfddd179b..030a236409af8438478aa2a286c6e7f45a9250c4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 Mon Aug 12 10:28:46 1996  Tom Tromey  <tromey@creche.cygnus.com>
 
+       * automake.in (require_file_internal): Special-case `.' when
+       finding files to distribute.  Test libobj2.test.
+
        * aclocal.in (add_file): Fixed regexp for matching AC_DEFUN.  Test
        order.test.
 

diff --git a/TODO b/TODO
index 9f5a2708e39e36d72ab1d06b07378db273e026ca..c67dd43e9f591eeea3022dda4e6573ceda6629ab 100644 (file)
--- a/TODO
+++ b/TODO
@@ -1,6 +1,9 @@
 Priorities for release:
   [ none ]
 
+!! Must fix require_file stuff.  It is really gross, and I don't
+   understand it any more.
+
 ** when can aclocal.m4 be auto-generated?
 
 ** many requests for a way to omit a file from the distribution.

diff --git a/automake.in b/automake.in
index c921c5e02a0cc33e3cce8b19f97edc9b47547162..fac9d5cdf6ad47e8adeda71c92cc81f1408f70cf 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -3396,7 +3396,9 @@ sub require_file_internal
            if (-f $fullfile)
            {
                $found_it = 1;
-               &push_dist_common ($file) if $dir eq $relative_dir;
+               # FIXME Once again, special-case `.'.
+               &push_dist_common ($file)
+                   if $dir eq $relative_dir || $dir eq '.';
                $save_dir = $dir;
                last;
            }

diff --git a/tests/ChangeLog b/tests/ChangeLog
index 5f836ccc4ff9322c4999e59aab1db39541c5f222..f2ade8edcec5595dc8678bdc801d689f00f501e5 100644 (file)
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,5 +1,7 @@
 Mon Aug 12 13:58:55 1996  Tom Tromey  <tromey@creche.cygnus.com>
 
+       * libobj2.test: New file.
+
        * order.test: New file.
 
 Sun Aug 11 00:10:42 1996  Tom Tromey  <tromey@creche.cygnus.com>

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 0fe8e5317d5cd0f90afce1d8484a35bca3f17250..430d1a4ef189aedc4147c5d158676a97be4b6747 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -13,6 +13,6 @@ yacc.test mkinstall2.test texinfo2.test ansi.test depacl.test depacl2.test \
 error.test colon.test vtexi2.test tags.test comment.test libfiles.test \
 man.test info.test obsolete.test lex.test scripts.test subdir2.test \
 exsource.test canon4.test dup.test defun.test cxxlink.test cxxnoc.test \
-order.test
+order.test libobj2.test
 
 EXTRA_DIST = defs $(TESTS)

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 28bed3a331c9e16a0e8ac26f0dbad3f6b2e83d21..76fb31cb22fe543b5c45cce70f7a8d8972b060e8 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.1c from Makefile.am
+# Makefile.in generated automatically by automake 1.1d from Makefile.am
 
 # Copyright (C) 1994, 1995, 1996 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
@@ -51,7 +51,7 @@ yacc.test mkinstall2.test texinfo2.test ansi.test depacl.test depacl2.test \
 error.test colon.test vtexi2.test tags.test comment.test libfiles.test \
 man.test info.test obsolete.test lex.test scripts.test subdir2.test \
 exsource.test canon4.test dup.test defun.test cxxlink.test cxxnoc.test \
-order.test
+order.test libobj2.test
 
 EXTRA_DIST = defs $(TESTS)
 mkinstalldirs = $(top_srcdir)/mkinstalldirs

diff --git a/tests/libobj2.test b/tests/libobj2.test
new file mode 100755 (executable)
index 0000000..85f8d89
--- /dev/null
+++ b/tests/libobj2.test
@@ -0,0 +1,30 @@
+#! /bin/sh
+
+# Test to make sure LIBOBJS works in subdirs.
+# Bug from Josh MacDonald.
+
+. $srcdir/defs || exit 1
+
+cat > configure.in << 'END'
+PACKAGE=nonesuch
+VERSION=nonesuch
+AC_ARG_PROGRAM
+AC_PROG_INSTALL
+AC_PROG_RANLIB
+LIBOBJS="$LIBOBJS fsusage.o"
+AC_OUTPUT(subdir/Makefile)
+END
+
+mkdir subdir
+
+cat > subdir/Makefile.am << 'END'
+noinst_LIBRARIES = tu
+tu_SOURCES =
+tu_LIBADD = @LIBOBJS@
+END
+
+: > subdir/fsusage.c
+
+$AUTOMAKE || exit 1
+
+grep 'fsusage\.c' subdir/Makefile.in