From 8ae718839de6c5e9f5f57612bcd89593e4836dc6 Mon Sep 17 00:00:00 2001 From: Akim Demaille Date: Fri, 18 May 2001 17:08:22 +0000 Subject: [PATCH] * lib/am/texinfos.am (install-info-am, uninstall-info-am): Be robust to missing `install-info'. --- ChangeLog | 5 +++++ automake.in | 3 +-- lib/am/texinfos.am | 11 +++++++++-- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index f36059ee..05231e69 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2001-05-18 Akim Demaille + + * lib/am/texinfos.am (install-info-am, uninstall-info-am): Be robust + to missing `install-info'. + 2001-05-17 Tom Tromey * automake.in (lang_c_finish): Use `rm -f'. diff --git a/automake.in b/automake.in index f09075e7..c0ac6dbf 100755 --- 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 f1c74cf2..a11a82d0 100644 --- 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, -- 2.43.5