Thu Jul 2 14:13:28 1998 Dave Love <d.love@dl.ac.uk>

	* Makefile.in (install-info): Don't use $realfile.  Ignore
	possible errors from the install-info program.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@20888 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 3ff93d4be817ca3ad3d04b856ef078ef0623badd..f95b73bacc282b33735a5757b29050cee6382ad8 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+Thu Jul  2 14:13:28 1998  Dave Love  <d.love@dl.ac.uk>
+
+       * Makefile.in (install-info): Don't use $realfile.  Ignore
+       possible errors from the install-info program.
+
 Thu Jul  2 01:53:32 1998  Alasdair Baird       <alasdair@wildcat.demon.co.uk>
 
        * combine.c (simplify_comparison): Apply SUBREG_REG to SUBREGs.

diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 8ffc3a20bb513fbfc0ef4ad693bfd3ff14a9c1c1..455ec5b1e6328b61311634851cdaa3a11fa5c543 100644 (file)
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -2374,17 +2374,15 @@ install-driver: xgcc$(exeext)
 
 # 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.
+# to do the install.
 install-info: doc installdirs lang.install-info
        -rm -f $(infodir)/cpp.info* $(infodir)/gcc.info*
        for f in cpp.info* gcc.info*; do \
-           realfile=`echo $$f | sed -e 's|.*/\([^/]*\)$$|\1|'`; \
-           $(INSTALL_DATA) $$f $(infodir)/$$realfile; \
+           $(INSTALL_DATA) $$f $(infodir)/$$f; \
        done
-       if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \
+       -if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \
            for f in cpp.info gcc.info; do \
-               realfile=`echo $$f | sed -e 's|.*/\([^/]*\)$$|\1|'`; \
-               install-info --dir-file=$(infodir)/dir $(infodir)/$$realfile; \
+               install-info --dir-file=$(infodir)/dir $(infodir)/$$f; \
            done; \
        else true; fi;
        -chmod a-x $(infodir)/cpp.info* $(infodir)/gcc.info*