* texinfos.am (uninstall-info): Use installed info file, not one

	from srcdir or builddir.

diff --git a/ChangeLog b/ChangeLog
index a372b66259cda69a958890fcc986593b63ac0eea..70f64df760d64ce7869ece1ca8647507ac11c3f0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+1999-10-27  Miodrag Vallat  <miodrag@ifrance.com>
+
+       * texinfos.am (uninstall-info): Use installed info file, not one
+       from srcdir or builddir.
+
 1999-11-07  Tom Tromey  <tromey@cygnus.com>
 
        * clean.am (maintainer-clean-generic): Remove Makefile.in.  From

diff --git a/lib/am/texinfos.am b/lib/am/texinfos.am
index c256f828f05e1c0237fbca07b1bb664d23f1d335..db4c79aaabd9fd39d4c3e12f4d2150fabdb83aa3 100644 (file)
--- a/lib/am/texinfos.am
+++ b/lib/am/texinfos.am
@@ -179,10 +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 \
-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; \
+## install-info needs the actual info file.  We use the installed one,
+## rather than relying on one still being in srcdir or builddir.
+           echo " install-info --info-dir=$(DESTDIR)$(infodir) --remove $(DESTDIR)$(infodir)/$$file"; \
+           install-info --info-dir=$(DESTDIR)$(infodir) --remove $(DESTDIR)$(infodir)/$$file; \
          done; \
        else :; fi
        @$(NORMAL_UNINSTALL)

diff --git a/texinfos.am b/texinfos.am
index c256f828f05e1c0237fbca07b1bb664d23f1d335..db4c79aaabd9fd39d4c3e12f4d2150fabdb83aa3 100644 (file)
--- a/texinfos.am
+++ b/texinfos.am
@@ -179,10 +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 \
-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; \
+## install-info needs the actual info file.  We use the installed one,
+## rather than relying on one still being in srcdir or builddir.
+           echo " install-info --info-dir=$(DESTDIR)$(infodir) --remove $(DESTDIR)$(infodir)/$$file"; \
+           install-info --info-dir=$(DESTDIR)$(infodir) --remove $(DESTDIR)$(infodir)/$$file; \
          done; \
        else :; fi
        @$(NORMAL_UNINSTALL)