accept local directory for fixincl in fixincl.sh script

Co-Authored-By: Bruce Korb <bkorb@gnu.org>
From-SVN: r42234

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 6114ab1e1c76a4927e62ec0b9ac55b00e7a80519..f356ee519c315fb0e952ecb6d7dcd06317830e96 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2001-05-17  Brendan Conoboy <blc@cygnus.com>
+           Bruce Korb <bkorb@gnu.org>
+
+       * fixinc/fixincl.sh(FIXINC): accept local directory if fixincl not
+       found in fixinc directory.  Facilitates binary distributions.
+
 2001-05-17  Jeffrey Oldham  <oldham@codesourcery.com>
 
        * dbxout.c (dbxout_symbol_location): For CONCAT, skip types not

diff --git a/gcc/fixinc/fixincl.sh b/gcc/fixinc/fixincl.sh
index fa2982f9d6335fd27cec1b97b1b57809ba9917d2..b84d7014d97632c764a7cc197a61a0646dfdd7ea 100755 (executable)
--- a/gcc/fixinc/fixincl.sh
+++ b/gcc/fixinc/fixincl.sh
@@ -97,6 +97,13 @@ esac
 ORIGDIR=`${PWDCMD}`
 export ORIGDIR
 FIXINCL=${ORIGDIR}/fixinc/fixincl
+if [ ! -x $FIXINCL ] ; then
+  FIXINCL=${ORIGDIR}/fixincl
+  if [ ! -x $FIXINCL ] ; then
+    echo "Cannot find working fixincl" >&2
+    exit 1
+  fi
+fi
 export FIXINCL
 
 # Make LIB absolute only if needed to avoid problems with the amd.