From 0cd176970c07cbe7117e5ec0e101d46e3d83641b Mon Sep 17 00:00:00 2001 From: downsj Date: Thu, 20 Mar 1997 11:32:02 +0000 Subject: [PATCH] Reference include directly to avoid $CDPATH clashes. --- gnu/usr.bin/gcc/Makefile.in | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/usr.bin/gcc/Makefile.in b/gnu/usr.bin/gcc/Makefile.in index c438ac02e29..d8c7610c7de 100644 --- a/gnu/usr.bin/gcc/Makefile.in +++ b/gnu/usr.bin/gcc/Makefile.in @@ -2205,7 +2205,7 @@ install-headers: install-include-dir $(INSTALL_HEADERS_DIR) $(INSTALL_ASSERT_H) # point to the installed directory, not the build directory. -files=`cd $(libsubdir)/include; find . -type l -print 2>/dev/null`; \ if [ $$? -eq 0 ]; then \ - dir=`cd include; pwd`; \ + dir=`cd ./include; pwd`; \ for i in $$files; do \ dest=`ls -ld $(libsubdir)/include/$$i | sed -n 's/.*-> //p'`; \ if expr "$$dest" : "$$dir.*" > /dev/null; then \ @@ -2223,7 +2223,7 @@ install-include-dir: install-dir # Install the include directory using tar. install-headers-tar: stmp-headers $(STMP_FIXPROTO) install-include-dir - (cd include; \ + (cd ./include; \ tar -cf - .; exit 0) | (cd $(libsubdir)/include; tar $(TAROUTOPTS) - ) # /bin/sh on some systems returns the status of the first tar, # and that can lose with GNU tar which always writes a full block. @@ -2231,7 +2231,8 @@ install-headers-tar: stmp-headers $(STMP_FIXPROTO) install-include-dir # Install the include directory using cpio. install-headers-cpio: stmp-headers $(STMP_FIXPROTO) install-include-dir - (cd include; find . -print) | (cd include; cpio -pdum $(libsubdir)/include) + (cd ./include; \ + find . -print) | (cd ./include; cpio -pdum $(libsubdir)/include) # Put assert.h where it won't override GNU libc's assert.h. # It goes in a dir that is searched after GNU libc's headers; -- 2.20.1