texinfo install fix

diff --git a/ChangeLog b/ChangeLog
index 86534262356a02fc7c7288d73735955f3b2ac4d1..cdb3c2437e7a3198eddb55bab44ff2817d63c1c1 100644 (file)
--- 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 fc4548d99b46d82fd33b294a6032848dc4e5b0ff..409dc61430eec1f7139c6c4cb0f27db69d22cd7c 100644 (file)
--- 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 61306c6ba46dc3d0e81fe396d0fda486a98c99ce..3ef6c693bb4869d15eb97c06e2bf2d34258ac1b1 100644 (file)
--- 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 61306c6ba46dc3d0e81fe396d0fda486a98c99ce..3ef6c693bb4869d15eb97c06e2bf2d34258ac1b1 100644 (file)
--- 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