Fix solaris2 (without GNU install installed) install failure.

	* Makefile.in (install-info): Don't cd into srcdir.  Add srcdir to
	filenames.  Use sed to extract base filename for install.

From-SVN: r14910

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 483e9dbcfb1bf47ab6198e0e21b2ff1785737d16..d9b77b0631275f6cf97aa87a4d1d532bf2a13840 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+Sun Aug 24 17:22:21 1997  Jim Wilson  <wilson@cygnus.com>
+
+       * Makefile.in (install-info): Don't cd into srcdir.  Add srcdir to
+       filenames.  Use sed to extract base filename for install.
+
 Sat Aug 23 18:19:40 1997  John F. Carr  <jfc@mit.edu>
 
        * unroll.c (find_splittable_givs): Only share if two givs have the

diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index b2735718d835c39709cf196fe49e9282e120abd6..0e377867723b1b6a1b575ddd5e96d399bf0de98f 100644 (file)
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -2242,10 +2242,14 @@ install-driver: xgcc
        fi
 
 # Install the info files.
+# $(INSTALL_DATA) might be a relative pathname, so we can't cd into srcdir
+# to do the install.  The sed rule was copied from stmp-int-hdrs.
 install-info: doc installdirs lang.install-info
        -rm -f $(infodir)/cpp.info* $(infodir)/gcc.info*
-       cd $(srcdir); for f in cpp.info* gcc.info*; \
-       do $(INSTALL_DATA) $$f $(infodir)/$$f; done
+       for f in $(srcdir)/cpp.info* $(srcdir)/gcc.info*; do \
+           realfile=`echo $$f | sed -e 's|.*/\([^/]*\)$$|\1|'`; \
+           $(INSTALL_DATA) $$f $(infodir)/$$realfile; \
+       done
        -chmod a-x $(infodir)/cpp.info* $(infodir)/gcc.info*
 
 # Install the man pages.

diff --git a/gcc/f/Make-lang.in b/gcc/f/Make-lang.in
index f8fda355449e5db135567d89d6c605483793eb3d..7c69383bbca7bd277370964e8dca43a0180d02a7 100644 (file)
--- a/gcc/f/Make-lang.in
+++ b/gcc/f/Make-lang.in
@@ -435,10 +435,14 @@ f77.install-common:
          fi ; \
        else true; fi
 
+# $(INSTALL_DATA) might be a relative pathname, so we can't cd into srcdir
+# to do the install.  The sed rule was copied from stmp-int-hdrs.
 f77.install-info:
        -rm -f $(infodir)/g77.info*
-       cd $(srcdir)/f; for f in g77.info*; \
-       do $(INSTALL_DATA) $$f $(infodir)/$$f; done
+       for f in $(srcdir)/f/g77.info*; do \
+           realfile=`echo $$f | sed -e 's|.*/\([^/]*\)$$|\1|'`; \
+           $(INSTALL_DATA) $$f $(infodir)/$$realfile; \
+       done
        -chmod a-x $(infodir)/g77.info*
 
 f77.install-man: $(srcdir)/f/g77.1