diff options
author | korbb <korbb@138bc75d-0d04-0410-961f-82ee72b054a4> | 1998-11-02 08:31:30 +0000 |
---|---|---|
committer | korbb <korbb@138bc75d-0d04-0410-961f-82ee72b054a4> | 1998-11-02 08:31:30 +0000 |
commit | 44566ddd49a0368c55abe0937ff3f684317e6f81 (patch) | |
tree | e8b83c3cf1a701c3cd1ef34abaa02a42f9ba5ce6 | |
parent | f9a39df181c35fa9938e1d7f9dd839708b68ae52 (diff) | |
download | ppe42-gcc-44566ddd49a0368c55abe0937ff3f684317e6f81.tar.gz ppe42-gcc-44566ddd49a0368c55abe0937ff3f684317e6f81.zip |
Reworked (slightly) to process a list of directories
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@23500 138bc75d-0d04-0410-961f-82ee72b054a4
-rwxr-xr-x | gcc/fixinc/fixinc.dgux | 29 | ||||
-rwxr-xr-x | gcc/fixinc/fixinc.irix | 28 | ||||
-rw-r--r-- | gcc/fixinc/fixinc.ptx | 29 | ||||
-rwxr-xr-x | gcc/fixinc/fixinc.sco | 26 | ||||
-rwxr-xr-x | gcc/fixinc/fixinc.svr4 | 30 | ||||
-rw-r--r-- | gcc/fixinc/fixinc.winnt | 8 | ||||
-rwxr-xr-x | gcc/fixinc/fixinc.wrap | 37 |
7 files changed, 155 insertions, 32 deletions
diff --git a/gcc/fixinc/fixinc.dgux b/gcc/fixinc/fixinc.dgux index 422ba5f725f..b70e3ec99e0 100755 --- 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 6562581df6e..58e1585d809 100755 --- 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 93a8f2c5d0e..ac8478a7aa3 100644 --- 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 5a1ca9f9ee1..67189029cc0 100755 --- 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 46e07ce0ac9..46dec852f0d 100755 --- 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 915ac723b85..7b8fe9ec9e7 100644 --- 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 406c87e9c03..4be9f132a1a 100755 --- 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 |