From: Tom Tromey <tromey@redhat.com>
Date: Mon, 8 Nov 1999 01:29:13 +0000 (+0000)
Subject: 	* texinfos.am (uninstall-info): Use installed info file, not one
X-Git-Tag: Release-1-4b~189
X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=8d3daf0125bdab4a370530d5fcd9dd40bf783cb1;p=automake.git

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

diff --git a/ChangeLog b/ChangeLog
index a372b662..70f64df7 100644
--- 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 c256f828..db4c79aa 100644
--- 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 c256f828..db4c79aa 100644
--- 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)