Reworked (slightly) to process a list of directories

From-SVN: r23500

diff --git a/gcc/fixinc/fixinc.dgux b/gcc/fixinc/fixinc.dgux
index 422ba5f725fd0d3ef3ed5986db8b5a1002f8fafb..b70e3ec99e0459a029070fe39d8ecc91e9e24314 100755 (executable)
--- a/gcc/fixinc/fixinc.dgux
+++ b/gcc/fixinc/fixinc.dgux
@@ -1,4 +1,4 @@
-#!/bin/sh
+# !/bin/sh
 #
 # modified for dgux by hassey@dg-rtp.dg.com based on
 #
@@ -24,9 +24,6 @@
 #
 #      See README-fixinc for more information.
 
-# Directory containing the original header files.
-INPUT=${2-${INPUT-/usr/include}}
-
 # Fail if no arg to specify a directory for the output.
 if [ x$1 = x ]
 then echo fixincludes: no output directory specified
@@ -41,7 +38,7 @@ if [ ! -d $LIB ]; then
   mkdir $LIB || exit 1
 fi
 
-ORIG_DIR=`pwd`
+ORIG_DIR=`${PWDCMD-pwd}`
 
 # Make LIB absolute if it is relative.
 # Don't do this if not necessary, since may screw up automounters.
@@ -64,7 +61,18 @@ else
 fi
 
 echo 'Making directories:'
+# Directory containing the original header files.
+shift
+if [ $# -eq 0 ] ; then
+  set /usr/include
+fi
+
+INLIST="$@"
+
+for INPUT in ${INLIST} ; do
+cd ${ORIG_DIR}
 cd ${INPUT}
+
 if $LINKS; then
   files=`ls -LR | sed -n s/:$//p`
 else
@@ -179,7 +187,14 @@ if $LINKS; then
   done
 fi
 
-cd ${ORIG_DIR}
+done
 
-exit 0
+if [ x${INSTALL_ASSERT_H} != x ] ;
+then
+  cd ${ORIG_DIR}
+  rm -f include/assert.h;
+  cp $(srcdir)/assert.h include/assert.h;
+  chmod a+r include/assert.h;
+fi
 
+exit 0

diff --git a/gcc/fixinc/fixinc.irix b/gcc/fixinc/fixinc.irix
index 6562581df6eb1090d6fb2d0f9893deab37435fc7..58e1585d8095db6ec4eb9c1cf421325260e324e4 100755 (executable)
--- a/gcc/fixinc/fixinc.irix
+++ b/gcc/fixinc/fixinc.irix
@@ -24,9 +24,6 @@
 #
 #      See README-fixinc for more information.
 
-# Directory containing the original header files.
-INPUT=${2-${INPUT-/usr/include}}
-
 # Fail if no arg to specify a directory for the output.
 if [ x$1 = x ]
 then echo fixincludes: no output directory specified
@@ -41,7 +38,7 @@ if [ ! -d $LIB ]; then
   mkdir $LIB || exit 1
 fi
 
-ORIG_DIR=`pwd`
+ORIG_DIR=`${PWDCMD-pwd}`
 
 # Make LIB absolute if it is relative.
 # Don't do this if not necessary, since may screw up automounters.
@@ -49,11 +46,22 @@ case $LIB in
 /*)
        ;;
 *)
-       LIB=$ORIG_DIR/$LIB
+       cd $LIB; LIB=`${PWDCMD-pwd}`
        ;;
 esac
 
 echo 'Building fixincludes in ' ${LIB}
+# Directory containing the original header files.
+shift
+if [ $# -eq 0 ] ; then
+  set /usr/include
+fi
+
+INLIST="$@"
+
+for INPUT in ${INLIST} ; do
+cd ${ORIG_DIR}
+cd ${INPUT}
 
 #
 # Note: For Irix, we deliberately don't try to create the directory trees,
@@ -222,4 +230,14 @@ extern pid_t __vfork(void);'\
   rm -f /tmp/$base
 fi
 
+done
+
+if [ x${INSTALL_ASSERT_H} != x ] ;
+then
+  cd ${ORIG_DIR}
+  rm -f include/assert.h;
+  cp $(srcdir)/assert.h include/assert.h;
+  chmod a+r include/assert.h;
+fi
+
 exit 0

diff --git a/gcc/fixinc/fixinc.ptx b/gcc/fixinc/fixinc.ptx
index 93a8f2c5d0e8e21b3dfb1bc4d6b887f47637b867..ac8478a7aa359e34f316d04695c94f61bd428385 100644 (file)
--- a/gcc/fixinc/fixinc.ptx
+++ b/gcc/fixinc/fixinc.ptx
@@ -34,9 +34,6 @@
 #
 #      See README-fixinc for more information.
 
-# Directory containing the original header files.
-INPUT=${2-${INPUT-/usr/include}}
-
 # Fail if no arg to specify a directory for the output.
 if [ x$1 = x ]
 then echo fixincludes: no output directory specified
@@ -51,7 +48,7 @@ if [ ! -d $LIB ]; then
   mkdir $LIB || exit 1
 fi
 
-ORIG_DIR=`pwd`
+ORIG_DIR=`${PWDCMD-pwd}`
 
 # Make LIB absolute if it is relative.
 # Don't do this if not necessary, since may screw up automounters.
@@ -59,7 +56,7 @@ case $LIB in
 /*)
        ;;
 *)
-       LIB=$ORIG_DIR/$LIB
+       cd $LIB; LIB=`${PWDCMD-pwd}`
        ;;
 esac
 
@@ -69,6 +66,17 @@ echo 'Running fixinc.svr4'
 echo 'Finished fixinc.svr4'
 
 echo 'Building fixincludes in ' ${LIB}
+# Directory containing the original header files.
+shift
+if [ $# -eq 0 ] ; then
+  set /usr/include
+fi
+
+INLIST="$@"
+
+for INPUT in ${INLIST} ; do
+cd ${ORIG_DIR}
+cd ${INPUT}
 
 # Copied from fixincludes.
 # Don't use or define the name va_list in stdio.h.
@@ -253,5 +261,14 @@ if [ \! -z "$file_to_fix" ]; then
   fi
 fi
 
-exit 0
+done
 
+if [ x${INSTALL_ASSERT_H} != x ] ;
+then
+  cd ${ORIG_DIR}
+  rm -f include/assert.h;
+  cp $(srcdir)/assert.h include/assert.h;
+  chmod a+r include/assert.h;
+fi
+
+exit 0

diff --git a/gcc/fixinc/fixinc.sco b/gcc/fixinc/fixinc.sco
index 5a1ca9f9ee1410d4bed1129d7469904d73f39049..67189029cc0ee68f587ac37c734c916d1efffd24 100755 (executable)
--- a/gcc/fixinc/fixinc.sco
+++ b/gcc/fixinc/fixinc.sco
@@ -39,9 +39,6 @@
 #
 #      See README-fixinc for more information.
 
-# Directory containing the original header files.
-INPUT=${2-${INPUT-/usr/include}}
-
 # Fail if no arg to specify a directory for the output.
 if [ x$1 = x ]
 then echo fixincludes: no output directory specified
@@ -56,7 +53,7 @@ if [ ! -d $LIB ]; then
   mkdir $LIB || exit 1
 fi
 
-ORIG_DIR=`pwd`
+ORIG_DIR=`${PWDCMD-pwd}`
 
 # Make LIB absolute if it is relative.
 # Don't do this if not necessary, since may screw up automounters.
@@ -79,7 +76,18 @@ else
 fi
 
 echo 'Making directories:'
+# Directory containing the original header files.
+shift
+if [ $# -eq 0 ] ; then
+  set /usr/include
+fi
+
+INLIST="$@"
+
+for INPUT in ${INLIST} ; do
+cd ${ORIG_DIR}
 cd ${INPUT}
+
 if $LINKS; then
   files=`ls -LR | sed -n s/:$//p`
 else
@@ -424,4 +432,14 @@ if $LINKS; then
   done
 fi
 
+done
+
+if [ x${INSTALL_ASSERT_H} != x ] ;
+then
+  cd ${ORIG_DIR}
+  rm -f include/assert.h;
+  cp $(srcdir)/assert.h include/assert.h;
+  chmod a+r include/assert.h;
+fi
+
 exit 0

diff --git a/gcc/fixinc/fixinc.svr4 b/gcc/fixinc/fixinc.svr4
index 46e07ce0ac9fc508f8a929a261a972ed7acfbc4e..46dec852f0d5472fdac21b4cd36c263c708b30de 100755 (executable)
--- a/gcc/fixinc/fixinc.svr4
+++ b/gcc/fixinc/fixinc.svr4
@@ -31,9 +31,6 @@
 #
 #      See README-fixinc for more information.
 
-# Directory containing the original header files.
-INPUT=${2-${INPUT-/usr/include}}
-
 # Fail if no arg to specify a directory for the output.
 if [ x$1 = x ]
 then echo fixincludes: no output directory specified
@@ -48,7 +45,7 @@ if [ ! -d $LIB ]; then
   mkdir $LIB || exit 1
 fi
 
-ORIG_DIR=`pwd`
+ORIG_DIR=`${PWDCMD-pwd}`
 
 # Make LIB absolute if it is relative.
 # Don't do this if not necessary, since may screw up automounters.
@@ -56,7 +53,7 @@ case $LIB in
 /*)
        ;;
 *)
-       LIB=$ORIG_DIR/$LIB
+       cd $LIB; LIB=`${PWDCMD-pwd}`
        ;;
 esac
 
@@ -71,7 +68,19 @@ else
 fi
 
 echo 'Making directories:'
+
+# Directory containing the original header files.
+shift
+if [ $# -eq 0 ] ; then
+  set /usr/include
+fi
+
+INLIST="$@"
+
+for INPUT in ${INLIST} ; do
+cd ${ORIG_DIR}
 cd ${INPUT}
+
 if $LINKS; then
   files=`find . -follow -type d -print 2>/dev/null | sed '/^.$/d'`
 else
@@ -1722,5 +1731,14 @@ __EOF__
 
 chmod a+r ${LIB}/sys/byteorder.h
 
-exit 0
+done
 
+if [ x${INSTALL_ASSERT_H} != x ] ;
+then
+  cd ${ORIG_DIR}
+  rm -f include/assert.h;
+  cp $(srcdir)/assert.h include/assert.h;
+  chmod a+r include/assert.h;
+fi
+
+exit 0

diff --git a/gcc/fixinc/fixinc.winnt b/gcc/fixinc/fixinc.winnt
index 915ac723b85e386db4665a71b9b34e8edcce2189..7b8fe9ec9e79105553db482a00b086700fba86fa 100644 (file)
--- a/gcc/fixinc/fixinc.winnt
+++ b/gcc/fixinc/fixinc.winnt
@@ -229,4 +229,12 @@ for file in $files; do
   rmdir $LIB/$file > NUL 2>&1
 done
 
+if [ x${INSTALL_ASSERT_H} != x ] ;
+then
+  cd ${ORIG_DIR}
+  rm -f include/assert.h;
+  cp $(srcdir)/assert.h include/assert.h;
+  chmod a+r include/assert.h;
+fi
+
 exit 0

diff --git a/gcc/fixinc/fixinc.wrap b/gcc/fixinc/fixinc.wrap
index 406c87e9c03bd42fe5ce35d8e7f1da8927ee16b6..4be9f132a1a408481fdd3167768b72bb0570a59c 100755 (executable)
--- a/gcc/fixinc/fixinc.wrap
+++ b/gcc/fixinc/fixinc.wrap
@@ -8,10 +8,6 @@
 #
 # See README-fixinc for more information.
 
-# Directory containing the original header files.
-# (This was named INCLUDES, but that conflicts with a name in Makefile.in.)
-INPUT=${2-${INPUT-/usr/include}}
-
 # Directory in which to store the results.
 LIB=${1?"fixincludes: output directory not specified"}
 
@@ -20,7 +16,30 @@ if [ ! -d $LIB ]; then
   mkdir $LIB || exit 1
 fi
 
+ORIG_DIR=`${PWDCMD-pwd}`
+
+# Make LIB absolute if it is relative.
+# Don't do this if not necessary, since may screw up automounters.
+case $LIB in
+/*)
+       ;;
+*)
+       cd $LIB; LIB=`${PWDCMD-pwd}`
+       ;;
+esac
+
 echo Building fixed headers in ${LIB}
+# Directory containing the original header files.
+shift
+if [ $# -eq 0 ] ; then
+  set /usr/include
+fi
+
+INLIST="$@"
+
+for INPUT in ${INLIST} ; do
+cd ${ORIG_DIR}
+cd ${INPUT}
 
 # Some math.h files define struct exception, which conflicts with
 # the class exception defined in the C++ file std/stdexcept.h.  We
@@ -83,4 +102,14 @@ __EOF__
   fi
 fi
 
+done
+
+if [ x${INSTALL_ASSERT_H} != x ] ;
+then
+  cd ${ORIG_DIR}
+  rm -f include/assert.h;
+  cp $(srcdir)/assert.h include/assert.h;
+  chmod a+r include/assert.h;
+fi
+
 exit 0