From: Alexandre Oliva Date: Tue, 27 Apr 1999 01:56:46 +0000 (+0000) Subject: * texinfos.am (uninstall-info): Look for info file in srcdir, just X-Git-Tag: merging-into-user-dep-gen~34 X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=aef02838ebfbb81cb09e9ad5002a346318ec3246;p=automake.git * texinfos.am (uninstall-info): Look for info file in srcdir, just like in install-info-am. Reported by Tudor Hulubei --- diff --git a/ChangeLog b/ChangeLog index 8a143c0e..5b3605d8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 1999-04-27 Alexandre Oliva + * texinfos.am (uninstall-info): Look for info file in srcdir, just + like in install-info-am. + Reported by Tudor Hulubei + * automake.in (handle_lib_objects_cond): \Q doesn't work either. Let's use the good ol' substitution, then. Reported by Russ Allbery diff --git a/lib/am/texinfos.am b/lib/am/texinfos.am index 117da12b..c256f828 100644 --- a/lib/am/texinfos.am +++ b/lib/am/texinfos.am @@ -179,8 +179,10 @@ uninstall-info: @if $(SHELL) -c 'install-info --version | sed 1q | fgrep -s -v -i debian' >/dev/null 2>&1; then \ list='$(INFO_DEPS)'; \ for file in $$list; do \ - echo " install-info --info-dir=$(DESTDIR)$(infodir) --remove $$file"; \ - install-info --info-dir=$(DESTDIR)$(infodir) --remove $$file; \ +CYGNUS if test -f $$file; then d=.; else d=$(srcdir); fi; \ +NOTCYGNUS d=$(srcdir); \ + echo " install-info --info-dir=$(DESTDIR)$(infodir) --remove $$d/$$file"; \ + install-info --info-dir=$(DESTDIR)$(infodir) --remove $$d/$$file; \ done; \ else :; fi @$(NORMAL_UNINSTALL) diff --git a/texinfos.am b/texinfos.am index 117da12b..c256f828 100644 --- a/texinfos.am +++ b/texinfos.am @@ -179,8 +179,10 @@ uninstall-info: @if $(SHELL) -c 'install-info --version | sed 1q | fgrep -s -v -i debian' >/dev/null 2>&1; then \ list='$(INFO_DEPS)'; \ for file in $$list; do \ - echo " install-info --info-dir=$(DESTDIR)$(infodir) --remove $$file"; \ - install-info --info-dir=$(DESTDIR)$(infodir) --remove $$file; \ +CYGNUS if test -f $$file; then d=.; else d=$(srcdir); fi; \ +NOTCYGNUS d=$(srcdir); \ + echo " install-info --info-dir=$(DESTDIR)$(infodir) --remove $$d/$$file"; \ + install-info --info-dir=$(DESTDIR)$(infodir) --remove $$d/$$file; \ done; \ else :; fi @$(NORMAL_UNINSTALL)