OSDN Git Service

* mkfixinc.sh: Check error code from 'cat'. Don't try running
authorgeoffk <geoffk@138bc75d-0d04-0410-961f-82ee72b054a4>
Tue, 23 Nov 2004 22:45:53 +0000 (22:45 +0000)
committergeoffk <geoffk@138bc75d-0d04-0410-961f-82ee72b054a4>
Tue, 23 Nov 2004 22:45:53 +0000 (22:45 +0000)
built fixincl program.
* mkheaders.in: Use @SHELL@ rather than ${SHELL} to avoid picking
up csh from user.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@91109 138bc75d-0d04-0410-961f-82ee72b054a4

fixincludes/ChangeLog
fixincludes/mkfixinc.sh
fixincludes/mkheaders.in

index 25a4e7f..9cc3244 100644 (file)
@@ -1,3 +1,10 @@
+2004-11-23  Geoffrey Keating  <geoffk@apple.com>
+
+       * mkfixinc.sh: Check error code from 'cat'.  Don't try running
+       built fixincl program.
+       * mkheaders.in: Use @SHELL@ rather than ${SHELL} to avoid picking
+       up csh from user.
+
 2004-11-20  Roger Sayle  <roger@eyesopen.com>
 
        * inclhack.def (alpha_pthread_init): Fix technical problems with
index d8b55c1..ef048f7 100755 (executable)
@@ -35,8 +35,7 @@ case $machine in
         ;;
 
     *)
-       ../${build_subdir}/fixincludes/fixincl -v < /dev/null
-       cat < ${srcdir}/fixinc.in > ${target}
+       cat < ${srcdir}/fixinc.in > ${target} || exit 1
        ;;
 esac
 chmod 755 ${target}
index 7216e9a..8330ac4 100644 (file)
@@ -77,7 +77,7 @@ rm -rf ${incdir}/*
 if [ x${STMP_FIXINC} != x ] ; then
        TARGET_MACHINE="${target}" target_canonical="${target}" \
            MACRO_LIST="${itoolsdatadir}/macro_list" \
-           ${SHELL} ./fixinc.sh ${incdir} \
+           @SHELL@ ./fixinc.sh ${incdir} \
            ${SYSTEM_HEADER_DIR} ${OTHER_FIXINCLUDES_DIRS}
        rm -f ${incdir}/syslimits.h
        if [ -f ${incdir}/limits.h ]; then
@@ -90,7 +90,7 @@ fi
 cp ${itoolsdatadir}/include/* ${incdir}
 
 if [ x${STMP_FIXPROTO} != x ] ; then
-  mkinstalldirs="${SHELL} ${itoolsdir}/mkinstalldirs"
+  mkinstalldirs="@SHELL@ ${itoolsdir}/mkinstalldirs"
   export FIXPROTO_DEFINES mkinstalldirs
-  ${SHELL} fixproto ${incdir} ${incdir} ${SYSTEM_HEADER_DIR} || exit 1
+  @SHELL@ fixproto ${incdir} ${incdir} ${SYSTEM_HEADER_DIR} || exit 1
 fi