--add-missing broken

[Ralf Corsepius]

Hi,

At present time, automake --add-missing is broken.

Apparent cause is this patch below.

Index: automake.in
===================================================================
RCS file: /cvs/automake/automake.in,v
retrieving revision 1.1046
retrieving revision 1.1047
diff -r1.1046 -r1.1047
72c80
< my $am_dir = "@datadir@/@PACKAGE@";
---
> my $am_dir = "@datadir@/@PACKAGE@/am";

=> automake now tries to pickup its support files from
<..>/automake/am instead of <..>/automake when processing
--add-missing.

One possible fix is attached below.

Related question: Which directory is am_dir/--am-dir supposed to
point to, now? <..>/automake/ or <..>/automake/am?

Ralf

-- 
Ralf Corsepius 
Forschungsinstitut fuer Anwendungsorientierte Wissensverarbeitung
(FAW)
Helmholtzstr. 16, 89081 Ulm, Germany     Tel: +49/731/501-8690
mailto:address@hidden           FAX: +49/731/501-999  
http://www.faw.uni-ulm.de

Index: automake.in
===================================================================
RCS file: /cvs/automake/automake.in,v
retrieving revision 1.1062
diff -u -r1.1062 automake.in
--- automake.in 2001/05/01 04:34:14     1.1062
+++ automake.in 2001/05/04 00:40:30
@@ -81,6 +81,7 @@
 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 @@
                        $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 @@
                        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";