(install-info): Changed per GNU standards

diff --git a/lib/am/texinfos.am b/lib/am/texinfos.am
index a92ce409f1eaece2a0873d21d3c33dfda21846cb..137d67a7721418ae8aded45d98d45c474d38d158 100644 (file)
--- a/lib/am/texinfos.am
+++ b/lib/am/texinfos.am
@@ -12,10 +12,22 @@ dvi:: $(DVIS)
 
 install:: install-info
 
+# FIXME: not sure what to do about install-info program.  We look in
+# `pwd` because there might be a newer file there than in srcdir.
 install-info: $(INFO_DEPS)
        $(top_srcdir)/mkinstalldirs $(infodir)
-       cd $(srcdir); for file in *.info*; do \
-         $(INSTALL_DATA) $$file $(infodir)/$$file; \
+       here=`pwd`; cd $(srcdir); for file in *.info*; do \
+         if test -f $$here/$$file; then        \
+           d=$here;                            \
+         else                                  \
+           d=.                                 \
+         fi;                                   \
+         $(INSTALL_DATA) $$d/$$file $(infodir)/$$file; \
+         if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \
+           install-info --infodir=$(infodir) $$d/$$file; \
+         else                                  \
+           true;                               \
+         fi;                                   \
        done
 
 uninstall:: uninstall-info

diff --git a/texinfos.am b/texinfos.am
index a92ce409f1eaece2a0873d21d3c33dfda21846cb..137d67a7721418ae8aded45d98d45c474d38d158 100644 (file)
--- a/texinfos.am
+++ b/texinfos.am
@@ -12,10 +12,22 @@ dvi:: $(DVIS)
 
 install:: install-info
 
+# FIXME: not sure what to do about install-info program.  We look in
+# `pwd` because there might be a newer file there than in srcdir.
 install-info: $(INFO_DEPS)
        $(top_srcdir)/mkinstalldirs $(infodir)
-       cd $(srcdir); for file in *.info*; do \
-         $(INSTALL_DATA) $$file $(infodir)/$$file; \
+       here=`pwd`; cd $(srcdir); for file in *.info*; do \
+         if test -f $$here/$$file; then        \
+           d=$here;                            \
+         else                                  \
+           d=.                                 \
+         fi;                                   \
+         $(INSTALL_DATA) $$d/$$file $(infodir)/$$file; \
+         if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \
+           install-info --infodir=$(infodir) $$d/$$file; \
+         else                                  \
+           true;                               \
+         fi;                                   \
        done
 
 uninstall:: uninstall-info