From: Tom Tromey <tromey@redhat.com>
Date: Fri, 4 Oct 1996 03:04:10 +0000 (+0000)
Subject: install-info --remove
X-Git-Tag: Release-1-1f~9
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f1d7fb2c8aa2b886d11ec89d7d026746214b0b1e;p=thirdparty%2Fautomake.git

install-info --remove
---

diff --git a/ChangeLog b/ChangeLog
index 93d33cfd4..a802ddfa6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 Thu Oct  3 20:11:16 1996  Tom Tromey  <tromey@cygnus.com>
 
+	* texinfos.am (uninstall-info): Run install-info --remove.
+
 	* automake.in (read_am_file): Define all variables after reading
 	.am file.  Test vpath.test.  Reported by Anthony Green.
 
diff --git a/Makefile.in b/Makefile.in
index 210296b5a..3e6bd043d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -199,12 +199,6 @@ install-info: $(INFO_DEPS)
 	    else : ; fi; \
 	  done; \
 	done
-	$(POST_INSTALL)
-	if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \
-	  for file in $(INFO_DEPS); do \
-	    install-info --info-dir=$(infodir) $$file; \
-	  done; \
-	else : ; fi
 
 uninstall-info:
 	cd $(srcdir) && for file in *.info*; do	\
diff --git a/lib/am/texinfos.am b/lib/am/texinfos.am
index 964779c5b..46992950d 100644
--- a/lib/am/texinfos.am
+++ b/lib/am/texinfos.am
@@ -57,6 +57,10 @@ install-info: $(INFO_DEPS)
 	else : ; fi
 
 uninstall-info:
-	cd $(srcdir) && for file in *.info*; do	\
-	  rm -f $(infodir)/$$file; \
+	if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \
+	  ii=yes; \
+	else ii=; fi; \
+	for file in $(INFO_DEPS); do \
+	  (cd $(infodir) && rm -f $$file $$file-[0-9] $$file-[0-9][0-9]); \
+	  test -z $ii || install-info --info-dir=$(infodir) --remove $$file; \
 	done
diff --git a/texinfos.am b/texinfos.am
index 964779c5b..46992950d 100644
--- a/texinfos.am
+++ b/texinfos.am
@@ -57,6 +57,10 @@ install-info: $(INFO_DEPS)
 	else : ; fi
 
 uninstall-info:
-	cd $(srcdir) && for file in *.info*; do	\
-	  rm -f $(infodir)/$$file; \
+	if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \
+	  ii=yes; \
+	else ii=; fi; \
+	for file in $(INFO_DEPS); do \
+	  (cd $(infodir) && rm -f $$file $$file-[0-9] $$file-[0-9][0-9]); \
+	  test -z $ii || install-info --info-dir=$(infodir) --remove $$file; \
 	done