More fixes

diff --git a/ChangeLog b/ChangeLog
index 03e43bd35f2b798775fae7921aa807dd3f365b31..205682ba26a99d533ecc8bffddfa0067bf9f2841 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,7 @@
 Mon Apr  1 09:47:44 1996  Tom Tromey  <tromey@creche.cygnus.com>
 
-       * automake.in (require_file_with_conf_line): Look in
-       $relative_dir, not ".".
-       (require_file_with_line): Ditto.
-       (require_file): Ditto.
+       * automake.in (require_file_internal): If $dir is ".",then look in
+       relative directory.
 
 Thu Mar 28 08:33:21 1996  Tom Tromey  <tromey@creche.cygnus.com>
 

diff --git a/TODO b/TODO
index 0a84bf440cd5f2550120113064c06a28ad0615c1..40f8303b4a964f3698d93135a8ce27c99dc0c857 100644 (file)
--- a/TODO
+++ b/TODO
@@ -196,6 +196,9 @@ Document gettext support
 
 Make a definition of the term "source"
 
+Better docs for foreign/gnits.  Explain how foreign relaxes
+constraints.
+
 ================================================================
 
 Libraries:

diff --git a/automake.in b/automake.in
index 460a57e2b6474aa98a2b9e5631558679aba029e0..59bebfb077ae4996d203f17c662fb5dffb526757 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -2633,7 +2633,14 @@ sub require_file_internal
        $found_it = 0;
        foreach $dir (@require_file_paths)
        {
-           $fullfile = $dir . "/" . $file;
+           if ($dir eq '.')
+           {
+               $fullfile = $relative_dir . "/" . $file;
+           }
+           else
+           {
+               $fullfile = $dir . "/" . $file;
+           }
 
            # Use different name for "error filename".  Otherwise on
            # an error the bad file will be reported as eg
@@ -2713,19 +2720,19 @@ sub require_file_internal
 # configure.in, not the current Makefile.am.
 sub require_file_with_conf_line
 {
-    @require_file_paths = $relative_dir;
+    @require_file_paths = '.';
     &require_file_internal (1, @_);
 }
 
 sub require_file_with_line
 {
-    @require_file_paths = $relative_dir;
+    @require_file_paths = '.';
     &require_file_internal (0, @_);
 }
 
 sub require_file
 {
-    @require_file_paths = $relative_dir;
+    @require_file_paths = '.';
     &require_file_internal (0, '', @_);
 }