Future/bison
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/bison.git synced 2026-03-09 12:23:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

* config/depcomp, config/install-sh: Update from masters.

Browse Source
This commit is contained in:
Akim Demaille
2003-06-25 13:45:57 +00:00
parent 0ae99356d5
commit 39910e0949
3 changed files with 186 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@@ -1,3 +1,7 @@
2003-06-25 Akim Demaille <akim@epita.fr>
* config/depcomp, config/install-sh: Update from masters.
2003-06-20 Paul Eggert <eggert@twinsun.com> 2003-06-20 Paul Eggert <eggert@twinsun.com>
* data/glr.c (YYLLOC_DEFAULT): Parenthesize arguments as needed, * data/glr.c (YYLLOC_DEFAULT): Parenthesize arguments as needed,

4
config/depcomp
View File

@@ -1,7 +1,7 @@
#! /bin/sh #! /bin/sh
# depcomp - compile a program generating dependencies as side-effects # depcomp - compile a program generating dependencies as side-effects
# Copyright 1999, 2000 Free Software Foundation, Inc. # Copyright 1999, 2000, 2003 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify # This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
@@ -271,7 +271,7 @@ tru64)
if test -f "$tmpdepfile"; then if test -f "$tmpdepfile"; then
sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
# That's a space and a tab in the []. # That's a space and a tab in the [].
sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
else else
echo "#dummy" > "$depfile" echo "#dummy" > "$depfile"
fi fi

368
config/install-sh
View File

@@ -1,7 +1,8 @@
#!/bin/sh #!/bin/sh
#
# install - install a program, script, or datafile # install - install a program, script, or datafile
#
scriptversion=2003-06-13.21
# This originates from X11R5 (mit/util/scripts/install.sh), which was # This originates from X11R5 (mit/util/scripts/install.sh), which was
# later released in X11R6 (xc/config/util/install.sh) with the # later released in X11R6 (xc/config/util/install.sh) with the
# following copyright and license. # following copyright and license.
@@ -41,13 +42,11 @@
# from scratch. It can only install one file at a time, a restriction # from scratch. It can only install one file at a time, a restriction
# shared with many OS's install programs. # shared with many OS's install programs.
# set DOITPROG to echo to test this script # set DOITPROG to echo to test this script
# Don't use :- since 4.3BSD and earlier shells don't like it. # Don't use :- since 4.3BSD and earlier shells don't like it.
doit="${DOITPROG-}" doit="${DOITPROG-}"
# put in absolute paths if you don't have them in your path; or use env. vars. # put in absolute paths if you don't have them in your path; or use env. vars.
mvprog="${MVPROG-mv}" mvprog="${MVPROG-mv}"
@@ -59,236 +58,229 @@ stripprog="${STRIPPROG-strip}"
rmprog="${RMPROG-rm}" rmprog="${RMPROG-rm}"
mkdirprog="${MKDIRPROG-mkdir}" mkdirprog="${MKDIRPROG-mkdir}"
transformbasename="" transformbasename=
transform_arg="" transform_arg=
instcmd="$mvprog" instcmd="$mvprog"
chmodcmd="$chmodprog 0755" chmodcmd="$chmodprog 0755"
chowncmd="" chowncmd=
chgrpcmd="" chgrpcmd=
stripcmd="" stripcmd=
rmcmd="$rmprog -f" rmcmd="$rmprog -f"
mvcmd="$mvprog" mvcmd="$mvprog"
src="" src=
dst="" dst=
dir_arg="" dir_arg=
while [ x"$1" != x ]; do usage="Usage: $0 [OPTION]... SRCFILE DSTFILE
case $1 in or: $0 -d DIR1 DIR2...
-c) instcmd=$cpprog
shift
continue;;
-d) dir_arg=true In the first form, install SRCFILE to DSTFILE, removing SRCFILE by default.
shift In the second, create the directory path DIR.
continue;;
-m) chmodcmd="$chmodprog $2" Options:
shift -b=TRANSFORMBASENAME
shift -c copy source (using $cpprog) instead of moving (using $mvprog).
continue;; -d create directories instead of installing files.
-g GROUP $chgrp installed files to GROUP.
-m MODE $chmod installed files to MODE.
-o USER $chown installed files to USER.
-s strip installed files (using $stripprog).
-t=TRANSFORM
--help display this help and exit.
--version display version info and exit.
-o) chowncmd="$chownprog $2" Environment variables override the default commands:
shift CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG
shift "
continue;;
-g) chgrpcmd="$chgrpprog $2" while test -n "$1"; do
shift case $1 in
shift -b=*) transformbasename=`echo $1 | sed 's/-b=//'`
continue;; shift
continue;;
-s) stripcmd=$stripprog -c) instcmd=$cpprog
shift shift
continue;; continue;;
-t=*) transformarg=`echo $1 | sed 's/-t=//'` -d) dir_arg=true
shift shift
continue;; continue;;
-b=*) transformbasename=`echo $1 | sed 's/-b=//'` -g) chgrpcmd="$chgrpprog $2"
shift shift
continue;; shift
continue;;
*) if [ x"$src" = x ] --help) echo "$usage"; exit 0;;
then
src=$1 -m) chmodcmd="$chmodprog $2"
else shift
# this colon is to work around a 386BSD /bin/sh bug shift
: continue;;
dst=$1
fi -o) chowncmd="$chownprog $2"
shift shift
continue;; shift
esac continue;;
-s) stripcmd=$stripprog
shift
continue;;
-t=*) transformarg=`echo $1 | sed 's/-t=//'`
shift
continue;;
--version) echo "$0 $scriptversion"; exit 0;;
*) if test -z "$src"; then
src=$1
else
# this colon is to work around a 386BSD /bin/sh bug
:
dst=$1
fi
shift
continue;;
esac
done done
if [ x"$src" = x ] if test -z "$src"; then
then echo "$0: no input file specified." >&2
echo "$0: no input file specified" >&2 exit 1
exit 1
else
:
fi fi
if [ x"$dir_arg" != x ]; then if test -n "$dir_arg"; then
dst=$src dst=$src
src="" src=
if [ -d "$dst" ]; then if test -d "$dst"; then
instcmd=: instcmd=:
chmodcmd="" chmodcmd=
else else
instcmd=$mkdirprog instcmd=$mkdirprog
fi fi
else else
# Waiting for this to be detected by the "$instcmd $src $dsttmp" command
# might cause directories to be created, which would be especially bad
# if $src (and thus $dsttmp) contains '*'.
if test ! -f "$src" && test ! -d "$src"; then
echo "$0: $src does not exist." >&2
exit 1
fi
# Waiting for this to be detected by the "$instcmd $src $dsttmp" command if test -z "$dst"; then
# might cause directories to be created, which would be especially bad echo "$0: no destination specified." >&2
# if $src (and thus $dsttmp) contains '*'. exit 1
fi
if [ -f "$src" ] || [ -d "$src" ] # If destination is a directory, append the input filename; won't work
then # if double slashes aren't ignored.
: if test -d "$dst"; then
else dst=$dst/`basename "$src"`
echo "$0: $src does not exist" >&2 fi
exit 1
fi
if [ x"$dst" = x ]
then
echo "$0: no destination specified" >&2
exit 1
else
:
fi
# If destination is a directory, append the input filename; if your system
# does not like double slashes in filenames, you may need to add some logic
if [ -d "$dst" ]
then
dst=$dst/`basename "$src"`
else
:
fi
fi fi
## this sed command emulates the dirname command ## this sed command emulates the dirname command
dstdir=`echo "$dst" | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'` dstdir=`echo "$dst" | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
# Make sure that the destination directory exists. # Make sure that the destination directory exists.
# this part is taken from Noah Friedman's mkinstalldirs script # (this part is taken from Noah Friedman's mkinstalldirs script.)
# Skip lots of stat calls in the usual case. # Skip lots of stat calls in the usual case.
if [ ! -d "$dstdir" ]; then if test ! -d "$dstdir"; then
defaultIFS=' defaultIFS='
' '
IFS="${IFS-$defaultIFS}" IFS="${IFS-$defaultIFS}"
oIFS=$IFS oIFS=$IFS
# Some sh's can't handle IFS=/ for some reason. # Some sh's can't handle IFS=/ for some reason.
IFS='%' IFS='%'
set - `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'` set - `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
IFS=$oIFS IFS=$oIFS
pathcomp='' pathcomp=
while [ $# -ne 0 ] ; do while test $# -ne 0 ; do
pathcomp=$pathcomp$1 pathcomp=$pathcomp$1
shift shift
test -d "$pathcomp" || $mkdirprog "$pathcomp"
if [ ! -d "$pathcomp" ] ; pathcomp=$pathcomp/
then done
$mkdirprog "$pathcomp"
else
:
fi
pathcomp=$pathcomp/
done
fi fi
if [ x"$dir_arg" != x ] if test -n "$dir_arg"; then
then $doit $instcmd "$dst" \
$doit $instcmd "$dst" && && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \
&& { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \
&& { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \
&& { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; }
if [ x"$chowncmd" != x ]; then $doit $chowncmd "$dst"; else : ; fi &&
if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "$dst"; else : ; fi &&
if [ x"$stripcmd" != x ]; then $doit $stripcmd "$dst"; else : ; fi &&
if [ x"$chmodcmd" != x ]; then $doit $chmodcmd "$dst"; else : ; fi
else else
# If we're going to rename the final executable, determine the name now.
if test -z "$transformarg"; then
dstfile=`basename "$dst"`
else
dstfile=`basename "$dst" $transformbasename \
| sed $transformarg`$transformbasename
fi
# If we're going to rename the final executable, determine the name now. # don't allow the sed command to completely eliminate the filename.
test -z "$dstfile" && dstfile=`basename "$dst"`
if [ x"$transformarg" = x ] # Make a couple of temp file names in the proper directory.
then dsttmp=$dstdir/_inst.$$_
dstfile=`basename "$dst"` rmtmp=$dstdir/_rm.$$_
else
dstfile=`basename "$dst" $transformbasename |
sed $transformarg`$transformbasename
fi
# don't allow the sed command to completely eliminate the filename # Trap to clean up those temp files at exit.
trap 'status=$?; rm -f "$dsttmp" "$rmtmp" && exit $status' 0
trap '(exit $?); exit' 1 2 13 15
if [ x"$dstfile" = x ] # Move or copy the file name to the temp name
then $doit $instcmd "$src" "$dsttmp" &&
dstfile=`basename "$dst"`
else
:
fi
# Make a couple of temp file names in the proper directory. # and set any options; do chmod last to preserve setuid bits.
#
# If any of these fail, we abort the whole thing. If we want to
# ignore errors from any of these, just make sure not to ignore
# errors from the above "$doit $instcmd $src $dsttmp" command.
#
{ test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
&& { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
&& { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \
&& { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } &&
dsttmp=$dstdir/#inst.$$# # Now remove or move aside any old file at destination location. We
rmtmp=$dstdir/#rm.$$# # try this two ways since rm can't unlink itself on some systems and
# the destination file might be busy for other reasons. In this case,
# Trap to clean up temp files at exit. # the final cleanup might fail but the new file should still install
# successfully.
trap 'status=$?; rm -f "$dsttmp" "$rmtmp" && exit $status' 0 {
trap '(exit $?); exit' 1 2 13 15 if test -f "$dstdir/$dstfile"; then
$doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \
# Move or copy the file name to the temp name || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \
|| {
$doit $instcmd "$src" "$dsttmp" && echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
(exit 1); exit
# and set any options; do chmod last to preserve setuid bits }
else
# If any of these fail, we abort the whole thing. If we want to :
# ignore errors from any of these, just make sure not to ignore fi
# errors from the above "$doit $instcmd $src $dsttmp" command. } &&
if [ x"$chowncmd" != x ]; then $doit $chowncmd "$dsttmp"; else :;fi &&
if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "$dsttmp"; else :;fi &&
if [ x"$stripcmd" != x ]; then $doit $stripcmd "$dsttmp"; else :;fi &&
if [ x"$chmodcmd" != x ]; then $doit $chmodcmd "$dsttmp"; else :;fi &&
# Now remove or move aside any old file at destination location. We try this
# two ways since rm can't unlink itself on some systems and the destination
# file might be busy for other reasons. In this case, the final cleanup
# might fail but the new file should still install successfully.
{
if [ -f "$dstdir/$dstfile" ]
then
$doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null ||
$doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null ||
{
echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
(exit 1); exit
}
else
:
fi
} &&
# Now rename the file to the real destination.
$doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
# Now rename the file to the real destination.
$doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
fi && fi &&
# The final little trick to "correctly" pass the exit status to the exit trap. # The final little trick to "correctly" pass the exit status to the exit trap.
{ {
(exit 0); exit (exit 0); exit
} }
# Local variables:
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
# time-stamp-end: "$"
# End: