More bug fixes

diff --git a/ChangeLog b/ChangeLog
index aa5696abffbeb6e3ec971927cfb71010f33d1bc5..dcc75154b1cdcee9852cd4e83296a81a69dae8c4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 Thu Apr  4 15:10:50 1996  Tom Tromey  <tromey@creche.cygnus.com>
 
+       * automake.in (handle_scripts): Never allow scripts_installed to
+       become 0.
+
+       * scripts.am (install-@DIR@SCRIPTS): Scripts can be found in
+       srcdir.
+
        * automake.in (generate_makefile): Derived file names from given
        input; don't assume Makefile.in and Makefile.am.
        (am_file_name, in_file_name): New globals.

diff --git a/automake.in b/automake.in
index b09ab5aec38334d6ced20cdfa3444291e4ce2b3c..b33a7b70e3271b490d3ea54e1a57aab5b78370fd 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -768,12 +768,13 @@ sub handle_scripts
     # NOTE we no longer automatically clean SCRIPTS, because it is
     # useful to sometimes distribute scripts verbatim.  This happens
     # eg in Automake itself.
-    $scripts_installed = &am_install_var ('scripts', 'SCRIPTS',
-                                         'bin', 'sbin', 'libexec', 'pkgdata',
-                                         'noinst', 'check');
+    local ($msi);
+    $msi = &am_install_var ('scripts', 'SCRIPTS',
+                           'bin', 'sbin', 'libexec', 'pkgdata',
+                           'noinst', 'check');
 
     # We really only want a boolean value.
-    $scripts_installed = 1 if $scripts_installed;
+    $scripts_installed = 1 if $msi;
 
     if ($scripts_installed)
     {

diff --git a/lib/am/scripts.am b/lib/am/scripts.am
index 6ccf12186dde291feb80b121c54f8636fe065f96..997e05f894361a693c0e1649227ec1ffdcae6b01 100644 (file)
--- a/lib/am/scripts.am
+++ b/lib/am/scripts.am
@@ -22,7 +22,10 @@ install-@DIR@SCRIPTS: $(@DIR@_SCRIPTS)
        list="$(@DIR@_SCRIPTS)"; for p in $$list; do \
          if test -f $$p; then \
            $(INSTALL_SCRIPT) $$p $(@DIR@dir)/`echo $$p|sed '$(transform)'`; \
-         else :; fi; \
+         else if test -f $(srcdir)/$$p; then \
+           $(INSTALL_SCRIPT) $(srcdir)/$$p \
+             $(@DIR@dir)/`echo $$p|sed '$(transform)'`; \
+         else :; fi; fi; \
        done
 
 uninstall-@DIR@SCRIPTS:

diff --git a/scripts.am b/scripts.am
index 6ccf12186dde291feb80b121c54f8636fe065f96..997e05f894361a693c0e1649227ec1ffdcae6b01 100644 (file)
--- a/scripts.am
+++ b/scripts.am
@@ -22,7 +22,10 @@ install-@DIR@SCRIPTS: $(@DIR@_SCRIPTS)
        list="$(@DIR@_SCRIPTS)"; for p in $$list; do \
          if test -f $$p; then \
            $(INSTALL_SCRIPT) $$p $(@DIR@dir)/`echo $$p|sed '$(transform)'`; \
-         else :; fi; \
+         else if test -f $(srcdir)/$$p; then \
+           $(INSTALL_SCRIPT) $(srcdir)/$$p \
+             $(@DIR@dir)/`echo $$p|sed '$(transform)'`; \
+         else :; fi; fi; \
        done
 
 uninstall-@DIR@SCRIPTS: