diff options
author | Peter Rosin <peda@lysator.liu.se> | 2012-01-30 23:16:37 +0100 |
---|---|---|
committer | Peter Rosin <peda@lysator.liu.se> | 2012-01-30 23:16:37 +0100 |
commit | 41404a8feb40b1d5853a45e6f8306daee6dc6607 (patch) | |
tree | 775d583de98d039d58a15a650cfba2ddc1dc2db6 | |
parent | 6bb56e40bd31baa2488f0975e9d03e69ba7e963e (diff) | |
download | automake-41404a8feb40b1d5853a45e6f8306daee6dc6607.tar.gz |
scripts: cherry-pick recent changes from master
* lib/ar-lib: prefer the term "Windows" over "Win32" and quote
'like this', not `like this'.
* lib/compile: Likewise.
-rwxr-xr-x | lib/ar-lib | 9 | ||||
-rwxr-xr-x | lib/compile | 30 |
2 files changed, 19 insertions, 20 deletions
diff --git a/lib/ar-lib b/lib/ar-lib index 4883fef74..85d028f4f 100755 --- a/lib/ar-lib +++ b/lib/ar-lib @@ -2,10 +2,9 @@ # Wrapper for Microsoft lib.exe me=ar-lib -scriptversion=2010-09-02.19; # UTC +scriptversion=2012-01-04.17; # UTC -# Copyright (C) 2010 Free Software -# Foundation, Inc. +# Copyright (C) 2010, 2012 Free Software Foundation, Inc. # Written by Peter Rosin <peda@lysator.liu.se>. # # This program is free software; you can redistribute it and/or modify @@ -42,7 +41,7 @@ file_conv= # func_file_conv build_file # Convert a $build file to $host form and store it in $file -# Currently only supports Win32 hosts. +# Currently only supports Windows hosts. func_file_conv () { file=$1 @@ -99,7 +98,7 @@ func_at_file () case $1 in '') - func_error "no command. Try \`$0 --help' for more information." + func_error "no command. Try '$0 --help' for more information." ;; -h | --h*) cat <<EOF diff --git a/lib/compile b/lib/compile index bac481cdc..b1f474915 100755 --- a/lib/compile +++ b/lib/compile @@ -1,10 +1,10 @@ #! /bin/sh -# Wrapper for compilers which do not understand `-c -o'. +# Wrapper for compilers which do not understand '-c -o'. -scriptversion=2010-11-15.09; # UTC +scriptversion=2012-01-04.17; # UTC -# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009, 2010 Free Software -# Foundation, Inc. +# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009, 2010, 2012 Free +# Software Foundation, Inc. # Written by Tom Tromey <tromey@cygnus.com>. # # This program is free software; you can redistribute it and/or modify @@ -40,7 +40,7 @@ file_conv= # func_file_conv build_file lazy # Convert a $build file to $host form and store it in $file -# Currently only supports Win32 hosts. If the determined conversion +# Currently only supports Windows hosts. If the determined conversion # type is listed in (the comma separated) LAZY, no conversion will # take place. func_file_conv () @@ -94,7 +94,7 @@ func_cl_wrapper () else case $1 in -o) - # configure might choose to run compile as `compile cc -o foo foo.c'. + # configure might choose to run compile as 'compile cc -o foo foo.c'. eat=1 case $2 in *.o | *.[oO][bB][jJ]) @@ -196,19 +196,19 @@ eat= case $1 in '') - echo "$0: No command. Try \`$0 --help' for more information." 1>&2 + echo "$0: No command. Try '$0 --help' for more information." 1>&2 exit 1; ;; -h | --h*) cat <<\EOF Usage: compile [--help] [--version] PROGRAM [ARGS] -Wrapper for compilers which do not understand `-c -o'. -Remove `-o dest.o' from ARGS, run PROGRAM with the remaining +Wrapper for compilers which do not understand '-c -o'. +Remove '-o dest.o' from ARGS, run PROGRAM with the remaining arguments, and rename the output as expected. If you are trying to build a whole package this is not the -right script to run: please start by reading the file `INSTALL'. +right script to run: please start by reading the file 'INSTALL'. Report bugs to <bug-automake@gnu.org>. EOF @@ -233,8 +233,8 @@ do else case $1 in -o) - # configure might choose to run compile as `compile cc -o foo foo.c'. - # So we strip `-o arg' only if arg is an object. + # configure might choose to run compile as 'compile cc -o foo foo.c'. + # So we strip '-o arg' only if arg is an object. eat=1 case $2 in *.o | *.obj) @@ -261,10 +261,10 @@ do done if test -z "$ofile" || test -z "$cfile"; then - # If no `-o' option was seen then we might have been invoked from a + # If no '-o' option was seen then we might have been invoked from a # pattern rule where we don't need one. That is ok -- this is a # normal compilation that the losing compiler can handle. If no - # `.c' file was seen then we are probably linking. That is also + # '.c' file was seen then we are probably linking. That is also # ok. exec "$@" fi @@ -273,7 +273,7 @@ fi cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'` # Create the lock directory. -# Note: use `[/\\:.-]' here to ensure that we don't use the same name +# Note: use '[/\\:.-]' here to ensure that we don't use the same name # that we are using for the .o file. Also, base the name on the expected # object file name, since that is what matters with a parallel build. lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d |