From 817da1f47ec3c29a2764f9cbbc975bfd48a50673 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Mon, 1 Apr 1996 21:36:03 +0000 Subject: [PATCH] More fixes --- ChangeLog | 6 ++---- TODO | 3 +++ automake.in | 15 +++++++++++---- 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 03e43bd35..205682ba2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,9 +1,7 @@ Mon Apr 1 09:47:44 1996 Tom Tromey - * 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 diff --git a/TODO b/TODO index 0a84bf440..40f8303b4 100644 --- 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 460a57e2b..59bebfb07 100755 --- 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, '', @_); } -- 2.11.4.GIT