inclhack.tpl: Test for directory before trying to cd into it.

Wed Jan 19 20:39:17 2000  Jim Wilson  <wilson@cygnus.com>

	* fixinc/inclhack.tpl: Test for directory before trying to cd into it.
	* fixinc/fixincl.sh, fixinc/inclhack.sh: Regenerate.

From-SVN: r32407

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 6bf7f288ae45743cf437d667d318b9ea21907c8e..d0d2174ba43ae11efea1edb7d31489cad8dc6a92 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,9 @@
 Tue Mar  7 21:41:17 2000  Jeffrey A Law  (law@cygnus.com)
 
+       Wed Jan 19 20:39:17 2000  Jim Wilson  <wilson@cygnus.com>
+       * fixinc/inclhack.tpl: Test for directory before trying to cd into it.
+       * fixinc/fixincl.sh, fixinc/inclhack.sh: Regenerate.
+
        Tue Oct 12 09:45:19 1999  Jonathan Larmour  <jlarmour@cygnus.co.uk>
        * config/rs6000/eabi-ctors.c (__do_global_ctors): Run through
        __CTOR_LIST__ in opposite order, which is the correct order for sorted

diff --git a/gcc/fixinc/fixincl.sh b/gcc/fixinc/fixincl.sh
index 56eebd60bc4c40b14eed93c85422c99604de09b3..05722bdff012549f9a2ad082ef7c54fce1fc50b6 100755 (executable)
--- a/gcc/fixinc/fixincl.sh
+++ b/gcc/fixinc/fixincl.sh
@@ -125,7 +125,12 @@ for INPUT in ${INPUTLIST} ; do
 
 cd ${ORIGDIR}
 
-cd ${INPUT} || continue
+# This originally used cd || continue, however, that does not work with the
+# Solaris2 /bin/sh.
+if [ ! -d ${INPUT} ]; then
+  continue
+fi
+cd ${INPUT}
 INPUT=`${PWDCMD}`
 
 #

diff --git a/gcc/fixinc/inclhack.sh b/gcc/fixinc/inclhack.sh
index f6fab88798bee9db01fc7faa1e7f5f99492e1e19..c2d85b1a4bfb0401f73d9e05002353ffa97807e6 100755 (executable)
--- a/gcc/fixinc/inclhack.sh
+++ b/gcc/fixinc/inclhack.sh
@@ -123,7 +123,12 @@ for INPUT in ${INPUTLIST} ; do
 
 cd ${ORIGDIR}
 
-cd ${INPUT} || continue
+# This originally used cd || continue, however, that does not work with the
+# Solaris2 /bin/sh.
+if [ ! -d ${INPUT} ]; then
+  continue
+fi
+cd ${INPUT}
 INPUT=`${PWDCMD}`
 
 #

diff --git a/gcc/fixinc/inclhack.tpl b/gcc/fixinc/inclhack.tpl
index 587a8e531438e1e33365999b73de5b23550348fb..2c76483ba628b02c15addeaefeefbccb237c3465 100644 (file)
--- a/gcc/fixinc/inclhack.tpl
+++ b/gcc/fixinc/inclhack.tpl
@@ -118,7 +118,12 @@ for INPUT in ${INPUTLIST} ; do
 
 cd ${ORIGDIR}
 
-cd ${INPUT} || continue
+# This originally used cd || continue, however, that does not work with the
+# Solaris2 /bin/sh.
+if [ ! -d ${INPUT} ]; then
+  continue
+fi
+cd ${INPUT}
 INPUT=`${PWDCMD}`
 
 #