* texinfos.am (uninstall-info): Look for info file in srcdir, just

like in install-info-am.
Reported by Tudor Hulubei <tudor@cs.unh.edu>

diff --git a/ChangeLog b/ChangeLog
index 8a143c0e2fa372d7ee1923be915d9a40a3ce1dc1..5b3605d88d4fe0debfaed95c41dd4a408bf0cb4f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 1999-04-27  Alexandre Oliva  <oliva@dcc.unicamp.br>
 
+       * texinfos.am (uninstall-info): Look for info file in srcdir, just 
+       like in install-info-am.
+       Reported by Tudor Hulubei <tudor@cs.unh.edu>
+
        * automake.in (handle_lib_objects_cond): \Q doesn't work either.
        Let's use the good ol' substitution, then.
        Reported by Russ Allbery <rra@stanford.edu>

diff --git a/lib/am/texinfos.am b/lib/am/texinfos.am
index 117da12b25587cf91f3c450b1a17e965bec7f05e..c256f828f05e1c0237fbca07b1bb664d23f1d335 100644 (file)
--- 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 117da12b25587cf91f3c450b1a17e965bec7f05e..c256f828f05e1c0237fbca07b1bb664d23f1d335 100644 (file)
--- 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)