hallvard@IFI.UIO.NO (Hallvard B Furuseth) (06/18/89)
Fixincludes echoes several $1's instead of $1's value.
I have made fixincludes try $1 and $libdir/gcc-include before using
/usr/local/lib/gcc-include, and inserted an 'includes:' target in the
Makefile.
On Ultrix, /bin/sh -ec 'if false ....' aborts because the "false" in
the if test is taken to be an error. Replaced
'if ...; then false; else ....; fi' in Makefile with
'if !...; then ....; else false; fi'.
Patches:
*** Makefile~ Fri Apr 07 20:24:19 1989
--- Makefile Fri Apr 14 20:24:19 1989
***************
*** 505,509
ln -s $(DIR)/config.gcc .
ln -s $(DIR)/move-if-change .
! if [ -f Makefile ] ; then false; else ln -s $(DIR)/Makefile . ; fi
-rm tm.h aux-output.c config.h md
make clean
--- 506,510 -----
ln -s $(DIR)/config.gcc .
ln -s $(DIR)/move-if-change .
! if [ ! -f Makefile ] ; then ln -s $(DIR)/Makefile . ; else false; fi
-rm tm.h aux-output.c config.h md
make clean
***************
*** 550,553 ****
--- 550,557 ----
rmdir temp
+ includes: force
+ libdir=$(libdir) fixincludes
+
+
#In GNU Make, ignore whether `stage*' exists.
.PHONY: stage1 stage2 stage3 clean realclean TAGS bootstrap
*** fixincludes~ Thu Apr 27 17:18:45 1989
--- fixincludes Wed May 31 17:09:55 1989
***************
*** 7,11 ****
# Directory in which to store the results.
! LIB=/usr/local/lib/gcc-include
# Determine whether this system has symbolic links.
--- 7,11 ----
# Directory in which to store the results.
! LIB=${1-${libdir-/usr/local/lib}/gcc-include}
# Determine whether this system has symbolic links.
***************
*** 53,57 ****
while [ $# != 0 ]; do
# $1 is an old directory to copy, and $2 is the new directory to copy to.
! echo 'Finding header files in $1:'
cd $1
files=`find . -type f -print`
--- 53,57 ----
while [ $# != 0 ]; do
# $1 is an old directory to copy, and $2 is the new directory to copy to.
! echo "Finding header files in $1:"
cd $1
files=`find . -type f -print`