MatCat.OpenSource/8sa1-gcc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Makefile.in (stmp-fixproto): Pass location of mkinstalldirs to fixproto.

Browse Source 
* Makefile.in (stmp-fixproto): Pass location of mkinstalldirs to
        fixproto.
        * fixproto: Avoid unportable constructs such as `basename' and
        `mkdir -p'.  Use mkinstalldirs from the environment if `mkdir -p'
        fails.

From-SVN: r26983
This commit is contained in:
Alexandre Oliva 1999-05-17 23:07:40 +00:00 committed by Jeff Law
parent a9a00d29b4
commit bcf1ba1d14
3 changed files with 28 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gcc/ChangeLog
View File

@ -1,5 +1,11 @@
Mon May 17 23:56:39 1999 Alexandre Oliva <oliva@dcc.unicamp.br> Mon May 17 23:56:39 1999 Alexandre Oliva <oliva@dcc.unicamp.br>
* Makefile.in (stmp-fixproto): Pass location of mkinstalldirs to
fixproto.
* fixproto: Avoid unportable constructs such as `basename' and
`mkdir -p'. Use mkinstalldirs from the environment if `mkdir -p'
fails.
* fixinc/fixincl.c: Remove #error, it is not portable. * fixinc/fixincl.c: Remove #error, it is not portable.
Mon May 17 23:50:41 1999 Marc Espie <espie@cvs.openbsd.org> Mon May 17 23:50:41 1999 Marc Espie <espie@cvs.openbsd.org>

2
gcc/Makefile.in
View File

@ -2244,6 +2244,8 @@ stmp-fixproto: fixhdr.ready fixproto stmp-headers
else \ else \
: This line works around a 'make' bug in BSDI 1.1.; \ : This line works around a 'make' bug in BSDI 1.1.; \
FIXPROTO_DEFINES="$(FIXPROTO_DEFINES)"; export FIXPROTO_DEFINES; \ FIXPROTO_DEFINES="$(FIXPROTO_DEFINES)"; export FIXPROTO_DEFINES; \
mkinstalldirs="$(SHELL) $(srcdir)/mkinstalldirs"; \
export mkinstalldirs; \
if [ -d $(SYSTEM_HEADER_DIR) ] ; then \ if [ -d $(SYSTEM_HEADER_DIR) ] ; then \
$(SHELL) ${srcdir}/fixproto include include $(SYSTEM_HEADER_DIR); \ $(SHELL) ${srcdir}/fixproto include include $(SYSTEM_HEADER_DIR); \
else true; fi; \ else true; fi; \

25
gcc/fixproto
View File

@ -54,12 +54,27 @@
# Ron Guilmette (rfg@netcom.com) (original idea and code) # Ron Guilmette (rfg@netcom.com) (original idea and code)
# Per Bothner (bothner@cygnus.com) (major re-write) # Per Bothner (bothner@cygnus.com) (major re-write)
progname=$0 dirname=`echo "$0" | sed 's,^[^/]*$,.,;s,//*[^/]*$,,'`
progname=`basename $progname` progname=`echo "$0" | sed 's,.*/,,'`
original_dir=`pwd` original_dir=`pwd`
FIX_HEADER=${FIX_HEADER-$original_dir/fix-header} FIX_HEADER=${FIX_HEADER-$original_dir/fix-header}
DEFINES="-D__STDC__=0 -D__cplusplus ${FIXPROTO_DEFINES}" DEFINES="-D__STDC__=0 -D__cplusplus ${FIXPROTO_DEFINES}"
if mkdir -p . 2> /dev/null; then
# Great, mkdir accepts -p
mkinstalldirs="mkdir -p"
else
# We expect mkinstalldirs to be passed in the environment.
# If it is not, assume it is in the directory that contains this script.
mkinstalldirs=${mkinstalldirs-"/bin/sh $dirname/mkinstalldirs"}
if $mkinstalldirs . 2> /dev/null; then
:
else
# But, in case of failure, fallback to plain mkdir, and hope it works
mkinstalldirs=mkdir
fi
fi
if [ `echo $1 | wc -w` = 0 ] ; then if [ `echo $1 | wc -w` = 0 ] ; then
echo $progname\: usage\: $progname target-dir \[ source-dir \.\.\. \] echo $progname\: usage\: $progname target-dir \[ source-dir \.\.\. \]
exit 1 exit 1
@ -94,7 +109,7 @@ fi
if [ \! -d $abs_target_dir ] ; then if [ \! -d $abs_target_dir ] ; then
echo $progname\: creating directory $rel_target_dir echo $progname\: creating directory $rel_target_dir
mkdir -p $abs_target_dir $mkinstalldirs $abs_target_dir
fi fi
echo $progname\: populating \`$rel_target_dir\' echo $progname\: populating \`$rel_target_dir\'
@ -175,7 +190,7 @@ for code in ALL STD ; do
abs_target_subdir=${abs_target_dir}/${rel_source_subdir} abs_target_subdir=${abs_target_dir}/${rel_source_subdir}
if [ \! -d $abs_target_subdir ] ; then if [ \! -d $abs_target_subdir ] ; then
if mkdir -p $abs_target_subdir ; then if $mkinstalldirs $abs_target_subdir ; then
subdirs_made="$abs_target_subdir $subdirs_made" subdirs_made="$abs_target_subdir $subdirs_made"
fi fi
fi fi
@ -202,7 +217,7 @@ for code in ALL STD ; do
# Create the dir where this file will go when fixed. # Create the dir where this file will go when fixed.
xxdir=`echo ./$file | sed -e 's|/[^/]*$||'` xxdir=`echo ./$file | sed -e 's|/[^/]*$||'`
if [ \! -d $abs_target_subdir/$xxdir ] ; then if [ \! -d $abs_target_subdir/$xxdir ] ; then
if mkdir -p $abs_target_subdir/$xxdir ; then if $mkinstalldirs $abs_target_subdir/$xxdir ; then
subdirs_made="$abs_target_subdir/$xxdir $subdirs_made" subdirs_made="$abs_target_subdir/$xxdir $subdirs_made"
fi fi
fi fi