[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Bison sync with Automake 1.8 (config/depcomp, config/install-sh)
From: |
Paul Eggert |
Subject: |
Bison sync with Automake 1.8 (config/depcomp, config/install-sh) |
Date: |
Tue, 23 Dec 2003 23:54:31 -0800 |
I applied the following changes from Automake 1.8 to Bison. (Does
anybody know why we can't simply remove the files, and let 'bootstrap'
make them?)
2003-12-23 Paul Eggert <address@hidden>
* config/depcomp, config/install-sh: Sync with Automake 1.8.
Index: config/depcomp
===================================================================
RCS file: /cvsroot/bison/bison/config/depcomp,v
retrieving revision 1.9
diff -p -u -r1.9 depcomp
--- config/depcomp 25 Aug 2003 18:47:36 -0000 1.9
+++ config/depcomp 24 Dec 2003 07:34:23 -0000
@@ -1,6 +1,8 @@
#! /bin/sh
-
# depcomp - compile a program generating dependencies as side-effects
+
+scriptversion=2003-11-08.23
+
# Copyright (C) 1999, 2000, 2003 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
@@ -25,6 +27,36 @@
# Originally written by Alexandre Oliva <address@hidden>.
+case $1 in
+ '')
+ echo "$0: No command. Try \`$0 --help' for more information." 1>&2
+ exit 1;
+ ;;
+ -h | --h*)
+ cat <<\EOF
+Usage: depcomp [--help] [--version] PROGRAM [ARGS]
+
+Run PROGRAMS ARGS to compile a file, generating dependencies
+as side-effects.
+
+Environment variables:
+ depmode Dependency tracking mode.
+ source Source file read by `PROGRAMS ARGS'.
+ object Object file output by `PROGRAMS ARGS'.
+ depfile Dependency file to output.
+ tmpdepfile Temporary file to use when outputing dependencies.
+ libtool Whether libtool is used (yes/no).
+
+Report bugs to <address@hidden>.
+EOF
+ exit 0
+ ;;
+ -v | --v*)
+ echo "depcomp $scriptversion"
+ exit 0
+ ;;
+esac
+
if test -z "$depmode" || test -z "$source" || test -z "$object"; then
echo "depcomp: Variables source, object and depmode must be set" 1>&2
exit 1
@@ -299,7 +331,7 @@ tru64)
dashmstdout)
# Important note: in order to support this mode, a compiler *must*
- # always write the proprocessed file to stdout, regardless of -o.
+ # always write the preprocessed file to stdout, regardless of -o.
"$@" || exit $?
# Remove the call to Libtool.
@@ -395,7 +427,7 @@ makedepend)
cpp)
# Important note: in order to support this mode, a compiler *must*
- # always write the proprocessed file to stdout.
+ # always write the preprocessed file to stdout.
"$@" || exit $?
# Remove the call to Libtool.
@@ -437,7 +469,7 @@ cpp)
msvisualcpp)
# Important note: in order to support this mode, a compiler *must*
- # always write the proprocessed file to stdout, regardless of -o,
+ # always write the preprocessed file to stdout, regardless of -o,
# because we must use -o when running libtool.
"$@" || exit $?
IFS=" "
@@ -477,3 +509,12 @@ none)
esac
exit 0
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
Index: config/install-sh
===================================================================
RCS file: /cvsroot/bison/bison/config/install-sh,v
retrieving revision 1.7
diff -p -u -r1.7 install-sh
--- config/install-sh 25 Jun 2003 13:45:57 -0000 1.7
+++ config/install-sh 24 Dec 2003 07:34:23 -0000
@@ -1,7 +1,7 @@
#!/bin/sh
# install - install a program, script, or datafile
-scriptversion=2003-06-13.21
+scriptversion=2003-09-24.23
# This originates from X11R5 (mit/util/scripts/install.sh), which was
# later released in X11R6 (xc/config/util/install.sh) with the
@@ -151,6 +151,11 @@ if test -z "$src"; then
exit 1
fi
+# Protect names starting with `-'.
+case $src in
+ -*) src=./$src ;;
+esac
+
if test -n "$dir_arg"; then
dst=$src
src=
@@ -175,6 +180,11 @@ else
exit 1
fi
+ # Protect names starting with `-'.
+ case $dst in
+ -*) dst=./$dst ;;
+ esac
+
# If destination is a directory, append the input filename; won't work
# if double slashes aren't ignored.
if test -d "$dst"; then
@@ -182,11 +192,10 @@ else
fi
fi
-## this sed command emulates the dirname command
+# This sed command emulates the dirname command.
dstdir=`echo "$dst" | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
# Make sure that the destination directory exists.
-# (this part is taken from Noah Friedman's mkinstalldirs script.)
# Skip lots of stat calls in the usual case.
if test ! -d "$dstdir"; then
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- Bison sync with Automake 1.8 (config/depcomp, config/install-sh),
Paul Eggert <=