* lib/am/texinfos.am (install-info-am, uninstall-info-am): Be robust

to missing `install-info'.

diff --git a/ChangeLog b/ChangeLog
index f36059ee799fe4c8ebe6b8c2e65a90763d6f47fd..05231e69cc058bcca9eceb3d81cb37a1b4459e8c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-05-18  Akim Demaille  <akim@epita.fr>
+
+       * lib/am/texinfos.am (install-info-am, uninstall-info-am): Be robust
+       to missing `install-info'.
+
 2001-05-17  Tom Tromey  <tromey@redhat.com>
 
        * automake.in (lang_c_finish): Use `rm -f'.

diff --git a/automake.in b/automake.in
index f09075e76c3e5b3bb9414bbf5cd3a091b4194b66..c0ac6dbf71359a0ebca0f9c957007792d739db51 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -32,8 +32,7 @@ package Language;
 BEGIN
 {
   my $prefix = "@prefix@";
-  my $perllibdir = $ENV{'perllibdir'} || "@datadir@/@PACKAGE@";
-  unshift @INC, "$perllibdir";
+  unshift @INC, $libdir ||"@datadir@/@PACKAGE@";
 }
 
 use Automake::Struct;

diff --git a/lib/am/texinfos.am b/lib/am/texinfos.am
index f1c74cf2c9a38021edba632ac91d23c1f7b33f10..a11a82d01efcf091d818b8779ea105d92e7714fc 100644 (file)
--- a/lib/am/texinfos.am
+++ b/lib/am/texinfos.am
@@ -123,7 +123,13 @@ install-info-am: $(INFO_DEPS)
 ## the Debian install-info.  FIXME: once Debian install-info goes
 ## away, we can remove this hack.  Debian install-info v1.8.3
 ## prints version info to stderr.
-       @if $(SHELL) -c 'install-info --version 2>&1 | sed 1q | fgrep -s -v -i debian' >/dev/null 2>&1; then \
+##
+## Do not use
+##    install-info --version 2>&1 | sed 1q | fgrep -s -v -i debian
+## as if install-info does not exist, fgrep -v will be happy, and
+## therefore the code will be triggered although install-info is missing.
+       @if (install-info --version && \
+            install-info --version | fgrep -i -v debian) >/dev/null 2>&1; then \
          list='$(INFO_DEPS)'; \
          for file in $$list; do \
 ## Run `:' after install-info in case install-info fails.  We really
@@ -157,7 +163,8 @@ uninstall-info-am:
 ## Run two loops here so that we can handle PRE_UNINSTALL and
 ## NORMAL_UNINSTALL correctly.  Debian install-info v1.8.3 prints
 ## version info to stderr.
-       @if $(SHELL) -c 'install-info --version 2>&1 | sed 1q | fgrep -s -v -i debian' >/dev/null 2>&1; then \
+       @if (install-info --version && \
+            install-info --version | fgrep -i -v debian) >/dev/null 2>&1; then \
          list='$(INFO_DEPS)'; \
          for file in $$list; do \
 ## install-info needs the actual info file.  We use the installed one,