diff options
| author | Jim Wilson <wilson@cygnus.com> | 1997-08-25 00:25:22 +0000 |
|---|---|---|
| committer | Jim Wilson <wilson@gcc.gnu.org> | 1997-08-24 17:25:22 -0700 |
| commit | feb9ea1a1f618a459ee8b1e8980008c537985df4 (patch) | |
| tree | c6c50b3cafa178fdd2cde1c7d62e522c72731e0c /gcc | |
| parent | 4c9e597b51319955fdf1d71613874899cbdeb631 (diff) | |
| download | gcc-feb9ea1a1f618a459ee8b1e8980008c537985df4.zip gcc-feb9ea1a1f618a459ee8b1e8980008c537985df4.tar.gz gcc-feb9ea1a1f618a459ee8b1e8980008c537985df4.tar.bz2 | |
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
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/Makefile.in | 8 | ||||
| -rw-r--r-- | gcc/f/Make-lang.in | 8 |
3 files changed, 17 insertions, 4 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 483e9db..d9b77b0 100644 --- 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 b273571..0e37786 100644 --- 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 f8fda35..7c69383 100644 --- 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 |