* automake.in ($pkgdata_dir): New.

(&require_file_internal): Use it.

diff --git a/ChangeLog b/ChangeLog
index 27e45224afdb388b1dcb74fddb77f82f514b79b4..005939dba92c656a3a2d79d60767d3ace8fd03a0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-05-04  Ralf Corsepius  <corsepiu@faw.uni-ulm.de>
+
+       * automake.in ($pkgdata_dir): New.
+       (&require_file_internal): Use it.
+
 2001-05-03  Akim Demaille  <akim@epita.fr>
 
        Case insensitive FS choke on Automake/ vs automake.

diff --git a/automake.in b/automake.in
index 0560b540187c9beacfad70a5142264a512d94403..bff61145b694e09c64cdf02286f5ef39581291df 100755 (executable)
--- 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";