From: Tom Tromey <tromey@redhat.com>
Date: Fri, 4 Apr 1997 02:27:35 +0000 (+0000)
Subject: texinfo install fix
X-Git-Tag: pre-ian-conditionals~34
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cffe5066dbec297cc129b7ed530f240ae7e3bafa;p=thirdparty%2Fautomake.git

texinfo install fix
---

diff --git a/ChangeLog b/ChangeLog
index 865342623..cdb3c2437 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 Thu Apr  3 19:07:59 1997  Tom Tromey  <tromey@cygnus.com>
 
+	* texinfos.am (install-info-am): If --cygnus, then info file can
+	be in build dir.  From David Zaroski.
+
 	* ltlibrary.am (@LTLIBRARY@): use @RPATH@, not explicit -rpath.
 
 	* automake.in (handle_ltlibraries): Treat EXTRA_ libraries
diff --git a/THANKS b/THANKS
index fc4548d99..409dc6143 100644
--- a/THANKS
+++ b/THANKS
@@ -6,6 +6,7 @@ Alexander V. Lukyanov <lav@yars.free.net>
 Andreas Schwab <schwab@lamothe.informatik.uni-dortmund.de>
 Anthony Green <green@cygnus.com>
 David A. Swierczek <swiercze@mr.med.ge.com>
+David Zaroski <cz253@cleveland.Freenet.Edu>
 Dieter Baron <dillo@stieltjes.smc.univie.ac.at>
 Erick Branderhorst <branderh@iaehv.nl>
 François Pinard <pinard@iro.umontreal.ca>
diff --git a/lib/am/texinfos.am b/lib/am/texinfos.am
index 61306c6ba..3ef6c693b 100644
--- a/lib/am/texinfos.am
+++ b/lib/am/texinfos.am
@@ -77,12 +77,14 @@ install-info-am: $(INFO_DEPS)
 	@$(NORMAL_INSTALL)
 	$(mkinstalldirs) $(infodir)
 	@for file in $(INFO_DEPS); do \
+CYGNUS	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
+NOTCYGNUS	  d=$(srcdir); \
 ## We use these strange circumlocutions because we want the "ifile" to
 ## be relative, for the install.
-	  for ifile in `cd $(srcdir) && echo $$file $$file-[0-9] $$file-[0-9][0-9]`; do \
-	    if test -f $(srcdir)/$$ifile; then \
-	      echo " $(INSTALL_DATA) $(srcdir)/$$ifile $(infodir)/$$ifile"; \
-	      $(INSTALL_DATA) $(srcdir)/$$ifile $(infodir)/$$ifile; \
+	  for ifile in `cd $$d && echo $$file $$file-[0-9] $$file-[0-9][0-9]`; do \
+	    if test -f $$d/$$ifile; then \
+	      echo " $(INSTALL_DATA) $$d/$$ifile $(infodir)/$$ifile"; \
+	      $(INSTALL_DATA) $$d/$$ifile $(infodir)/$$ifile; \
 	    else : ; fi; \
 	  done; \
 	done
diff --git a/texinfos.am b/texinfos.am
index 61306c6ba..3ef6c693b 100644
--- a/texinfos.am
+++ b/texinfos.am
@@ -77,12 +77,14 @@ install-info-am: $(INFO_DEPS)
 	@$(NORMAL_INSTALL)
 	$(mkinstalldirs) $(infodir)
 	@for file in $(INFO_DEPS); do \
+CYGNUS	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
+NOTCYGNUS	  d=$(srcdir); \
 ## We use these strange circumlocutions because we want the "ifile" to
 ## be relative, for the install.
-	  for ifile in `cd $(srcdir) && echo $$file $$file-[0-9] $$file-[0-9][0-9]`; do \
-	    if test -f $(srcdir)/$$ifile; then \
-	      echo " $(INSTALL_DATA) $(srcdir)/$$ifile $(infodir)/$$ifile"; \
-	      $(INSTALL_DATA) $(srcdir)/$$ifile $(infodir)/$$ifile; \
+	  for ifile in `cd $$d && echo $$file $$file-[0-9] $$file-[0-9][0-9]`; do \
+	    if test -f $$d/$$ifile; then \
+	      echo " $(INSTALL_DATA) $$d/$$ifile $(infodir)/$$ifile"; \
+	      $(INSTALL_DATA) $$d/$$ifile $(infodir)/$$ifile; \
 	    else : ; fi; \
 	  done; \
 	done