From c049e701f7e3f476fa0d4cb87768555bf9677706 Mon Sep 17 00:00:00 2001 From: Akim Demaille Date: Fri, 4 May 2001 08:39:53 +0000 Subject: [PATCH] * automake.in ($pkgdata_dir): New. (&require_file_internal): Use it. --- ChangeLog | 5 +++++ automake.in | 7 ++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 27e45224..005939db 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2001-05-04 Ralf Corsepius + + * automake.in ($pkgdata_dir): New. + (&require_file_internal): Use it. + 2001-05-03 Akim Demaille Case insensitive FS choke on Automake/ vs automake. diff --git a/automake.in b/automake.in index 0560b540..bff61145 100755 --- a/automake.in +++ b/automake.in @@ -81,6 +81,7 @@ my $VERSION = "@VERSION@"; my $PACKAGE = "@PACKAGE@"; my $prefix = "@prefix@"; my $am_dir = "@datadir@/@PACKAGE@/am"; +my $pkgdata_dir = "@datadir@/@PACKAGE@"; # String constants. my $IGNORE_PATTERN = '^##([^#].*)?$'; @@ -7457,7 +7458,7 @@ sub require_file_internal $suppress = 0; $trailer = "; cannot run `libtoolize': $!"; } - elsif (-f ($am_dir . '/' . $file)) + elsif (-f ("$pkgdata_dir/$file")) { # Install the missing file. Symlink if we # can, copy if we must. Note: delete the file @@ -7468,13 +7469,13 @@ sub require_file_internal unlink ($errfile) if -f $errfile; if ($symlink_exists && ! $copy_missing) { - if (! symlink ($am_dir . '/' . $file, $errfile)) + if (! symlink ("$pkgdata_dir/$file", $errfile)) { $suppress = 0; $trailer = "; error while making link: $!"; } } - elsif (system ('cp', $am_dir . '/' . $file, $errfile)) + elsif (system ('cp', "$pkgdata_dir/$file", $errfile)) { $suppress = 0; $trailer = "\n error while copying"; -- 2.43.5