On 01/04/12 05:37, Stefano Lattarini wrote: > Care to fix those too? Here's a revised version of Bruno's patch that attempts to address all the issues that you raised.
>From ef5461d37207a965217e1b09c8ef257622f9d43c Mon Sep 17 00:00:00 2001 From: Paul Eggert <egg...@cs.ucla.edu> Date: Wed, 4 Jan 2012 07:51:07 -0800 Subject: [PATCH] cosmetics: prefer the term "native Windows" over "Win32" Microsoft has renamed the Win32 API to "Windows API": <http://msdn.microsoft.com/en-us/library/aa383723.aspx> Also, after some discussion on bug-gnulib, when talking about hosts and platforms we believe it's better to talk about "native Windows" instead: <https://lists.gnu.org/archive/html/bug-gnulib/2012-01/msg00009.html> <https://lists.gnu.org/archive/html/bug-gnulib/2012-01/msg00027.html> --- doc/automake.texi | 3 ++- lib/Automake/XFile.pm | 2 +- lib/ar-lib | 2 +- lib/compile | 4 ++-- tests/compile2.test | 2 +- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/doc/automake.texi b/doc/automake.texi index a346233..fb584b6 100644 --- a/doc/automake.texi +++ b/doc/automake.texi @@ -10242,7 +10242,8 @@ test. For instance, @command{false} (from GNU coreutils) is never successful, even for @option{--help} or @option{--version}. You can list such programs in the variable @code{AM_INSTALLCHECK_STD_OPTIONS_EXEMPT}. Programs (not scripts) listed in this variable should be suffixed by -@samp{$(EXEEXT)} for the sake of Win32 or OS/2. For instance, suppose we +@samp{$(EXEEXT)} for the sake of native Windows or OS/2. +For instance, suppose we build @file{false} as a program but @file{true.sh} as a script, and that neither of them support @option{--help} or @option{--version}: diff --git a/lib/Automake/XFile.pm b/lib/Automake/XFile.pm index 4ba84ce..68b1750 100644 --- a/lib/Automake/XFile.pm +++ b/lib/Automake/XFile.pm @@ -176,7 +176,7 @@ C<\n> on input files. =cut -# Some Win32/perl installations fail to translate \r\n to \n on input +# Some native Windows/perl installations fail to translate \r\n to \n on input # so we do that here. sub getline { diff --git a/lib/ar-lib b/lib/ar-lib index 4883fef..d90c636 100755 --- a/lib/ar-lib +++ b/lib/ar-lib @@ -42,7 +42,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 native Windows hosts. func_file_conv () { file=$1 diff --git a/lib/compile b/lib/compile index bac481c..de0e447 100755 --- a/lib/compile +++ b/lib/compile @@ -1,7 +1,7 @@ #! /bin/sh # Wrapper for compilers which do not understand `-c -o'. -scriptversion=2010-11-15.09; # UTC +scriptversion=2012-01-04.15; # UTC # Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009, 2010 Free Software # Foundation, Inc. @@ -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 native Windows hosts. If the determined conversion # type is listed in (the comma separated) LAZY, no conversion will # take place. func_file_conv () diff --git a/tests/compile2.test b/tests/compile2.test index c89be9f..1894d63 100755 --- a/tests/compile2.test +++ b/tests/compile2.test @@ -65,7 +65,7 @@ test -f "$amtest_object" # Absolute w32 paths should be accepted. # Do not actually run this test on anything that could be w32. if test -d 'C:\'; then - skip_ "this test shouldn't run on a win32-like system" + skip_ "this test shouldn't run on a native Windows-like system" fi case $PATH_SEPARATOR in ';'|':');; -- 1.7.6.4
