From: Tom Tromey <tromey@redhat.com>
Date: Tue, 21 Nov 1995 08:53:47 +0000 (+0000)
Subject: (install-info): Rewrote
X-Git-Tag: Release-0-25~279
X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=2e1a1fa58b407d00421240218a6b456ade6e7867;p=automake.git

(install-info): Rewrote
---

diff --git a/lib/am/texinfos.am b/lib/am/texinfos.am
index 9a076578..49915a6c 100644
--- a/lib/am/texinfos.am
+++ b/lib/am/texinfos.am
@@ -12,18 +12,20 @@ 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.
+# Look in both . and srcdir because the info pages might have been
+# rebuilt in the build directory.  Can't cd to srcdir; that might
+# break a possible install-sh reference.
 install-info: $(INFO_DEPS)
 	$(top_srcdir)/mkinstalldirs $(infodir)
-	cd $(srcdir);				\
-	for file in `cd $(srcdir); echo *.info*`; do \
+	for file in $(INFO_DEPS); do		\
 	  if test -f $$file; then		\
 	    d=.;				\
 	  else					\
-	    d=$(srcdir);			\
+	    d=${srcdir};			\
 	  fi;					\
-	  $(INSTALL_DATA) $$d/$$file $(infodir)/$$file; \
+	  for ifile in $${file}*; do		\
+	    $(INSTALL_DATA) $$d/$$ifile $(infodir)/$$file; \
+	  done;					\
 	  if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \
 	    install-info --infodir=$(infodir) $$d/$$file; \
 	  else					\
diff --git a/texinfos.am b/texinfos.am
index 9a076578..49915a6c 100644
--- a/texinfos.am
+++ b/texinfos.am
@@ -12,18 +12,20 @@ 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.
+# Look in both . and srcdir because the info pages might have been
+# rebuilt in the build directory.  Can't cd to srcdir; that might
+# break a possible install-sh reference.
 install-info: $(INFO_DEPS)
 	$(top_srcdir)/mkinstalldirs $(infodir)
-	cd $(srcdir);				\
-	for file in `cd $(srcdir); echo *.info*`; do \
+	for file in $(INFO_DEPS); do		\
 	  if test -f $$file; then		\
 	    d=.;				\
 	  else					\
-	    d=$(srcdir);			\
+	    d=${srcdir};			\
 	  fi;					\
-	  $(INSTALL_DATA) $$d/$$file $(infodir)/$$file; \
+	  for ifile in $${file}*; do		\
+	    $(INSTALL_DATA) $$d/$$ifile $(infodir)/$$file; \
+	  done;					\
 	  if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \
 	    install-info --infodir=$(infodir) $$d/$$file; \
 	  else					\