install-info --remove

diff --git a/ChangeLog b/ChangeLog
index 93d33cfd4798763b2e03732c2dae2eebbb4438ff..a802ddfa6adb707790e9f2bed23abeed3d60f1bd 100644 (file)
--- 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 210296b5a13bdcaf120ba21ddbef8baa468e5e8d..3e6bd043d2179c400c2974923b134190873aedeb 100644 (file)
--- 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 964779c5bfdd34ea43ae96406044d8f351a0692f..46992950dd1f7222ed2f904fdb8709f2582f1c2c 100644 (file)
--- 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 964779c5bfdd34ea43ae96406044d8f351a0692f..46992950dd1f7222ed2f904fdb8709f2582f1c2c 100644 (file)
--- 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