From e6c0ec3bb323a99ad89ed68d43bc5ce03c0d5e38 Mon Sep 17 00:00:00 2001 From: Manoj Srivastava Date: Mon, 10 Apr 2006 21:45:42 +0000 Subject: [PATCH] Imported make-3.81 Imported make-3.81 into srivasta@debian.org--etch/make--upstream--3.81 git-archimport-id: srivasta@debian.org--etch/make--upstream--3.81--patch-7 --- ChangeLog | 42 ++++ Makefile.DOS | 2 +- Makefile.am | 8 +- Makefile.in | 7 +- NEWS | 6 +- README | 2 +- README.DOS | 4 +- README.W32 | 2 +- SMakefile | 4 +- config.ami | 2 +- config.h-vms | 2 +- config.h.W32 | 6 +- config/Makefile.in | 2 +- config/mdate-sh | 201 +++++++++++++++++ config/texinfo.tex | 15 +- configh.dos | 6 +- configure | 24 +-- configure.in | 6 +- doc/Makefile.in | 40 +++- doc/make.info | 335 +++++++++++++++-------------- doc/make.info-1 | 71 +++--- doc/make.info-2 | 41 ++-- doc/make.texi | 109 ++++------ doc/stamp-vti | 4 + doc/version.texi | 4 + function.c | 22 +- implicit.c | 19 +- misc.c | 2 +- po/be.gmo | Bin 13014 -> 13014 bytes po/be.po | 22 +- po/da.gmo | Bin 33647 -> 33647 bytes po/da.po | 22 +- po/de.gmo | Bin 30130 -> 30130 bytes po/de.po | 22 +- po/es.gmo | Bin 38922 -> 38922 bytes po/es.po | 22 +- po/fi.gmo | Bin 36130 -> 36130 bytes po/fi.po | 22 +- po/fr.gmo | Bin 38748 -> 38748 bytes po/fr.po | 22 +- po/ga.gmo | Bin 38003 -> 38003 bytes po/ga.po | 22 +- po/gl.gmo | Bin 35587 -> 35587 bytes po/gl.po | 22 +- po/he.gmo | Bin 24709 -> 24709 bytes po/he.po | 22 +- po/hr.gmo | Bin 34206 -> 34206 bytes po/hr.po | 22 +- po/id.gmo | Bin 26178 -> 26178 bytes po/id.po | 22 +- po/ja.gmo | Bin 34297 -> 34297 bytes po/ja.po | 22 +- po/ko.gmo | Bin 25548 -> 25548 bytes po/ko.po | 22 +- po/make.pot | 22 +- po/nl.gmo | Bin 37579 -> 37579 bytes po/nl.po | 22 +- po/pl.gmo | Bin 37357 -> 37357 bytes po/pl.po | 22 +- po/pt_BR.gmo | Bin 34550 -> 34550 bytes po/pt_BR.po | 22 +- po/ru.gmo | Bin 26918 -> 26918 bytes po/ru.po | 22 +- po/rw.gmo | Bin 659 -> 659 bytes po/rw.po | 22 +- po/sv.gmo | Bin 25744 -> 25744 bytes po/sv.po | 22 +- po/tr.gmo | Bin 35632 -> 35632 bytes po/tr.po | 22 +- po/uk.gmo | Bin 19114 -> 19114 bytes po/uk.po | 22 +- po/vi.gmo | Bin 42921 -> 42921 bytes po/vi.po | 22 +- po/zh_CN.gmo | Bin 20304 -> 20304 bytes po/zh_CN.po | 22 +- tests/ChangeLog | 5 + tests/scripts/features/parallelism | 38 ++-- tests/scripts/functions/realpath | 39 ++-- w32/Makefile | 6 +- 79 files changed, 955 insertions(+), 649 deletions(-) create mode 100755 config/mdate-sh create mode 100644 doc/stamp-vti create mode 100644 doc/version.texi diff --git a/ChangeLog b/ChangeLog index 03416b90..df6a509f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,45 @@ +2006-04-01 Paul D. Smith + + Version 3.81 released. + + * NEWS: Updated for 3.81. + + * README.cvs: Mention that vpath builds are not supported out of + CVS. Fixes Savannah bug #16236. + Remove update of make.texi from the list of things to do; we use + version.texi now. + +2006-03-26 Paul D. Smith + + * doc/make.texi: Clean up licensing. Use @copying and version.texi + support from automake, as described in the Texinfo manual. + +2006-03-25 Eli Zaretskii + + * implicit.c (pattern_search) [HAVE_DOS_PATHS]: Don't compare b + with lastslash, since the latter points to filename, not to + target. + * job.c (construct_command_argv_internal) [HAVE_DOS_PATHS]: + Declare and define sh_chars_sh[]. + +2006-03-23 Paul D. Smith + + * configure.in: Look for build.sh.in in $srcdir so it will be + built for remote configurations as well. + + * Makefile.am: Make sure to clean up build.sh during distclean. + Fixes Savannah bug #16166. + + * misc.c (log_access): Takes a const char *. + * function.c (fold_newlines): Takes an unsigned int *. + Both fixes for Savannah bug #16170. + +2006-03-22 Boris Kolpackov + + * implicit.c (pattern_search): Call set_file_variables only + if we have prerequisites that need second expansion. Fixes + Savannah bug #16140. + 2006-03-19 Paul D. Smith * remake.c (update_file): Add alloca(0) to clean up alloca'd diff --git a/Makefile.DOS b/Makefile.DOS index a1764827..96c0ec23 100644 --- a/Makefile.DOS +++ b/Makefile.DOS @@ -71,7 +71,7 @@ PACKAGE = make PERL = perl RANLIB = ranlib REMOTE = stub -VERSION = 3.81rc2 +VERSION = 3.81 AUTOMAKE_OPTIONS = 1.2 diff --git a/Makefile.am b/Makefile.am index d7413604..82274bb7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -19,6 +19,8 @@ AUTOMAKE_OPTIONS = 1.8 dist-bzip2 check-news ansi2knr ACLOCAL_AMFLAGS = -I config +MAKE_HOST = @MAKE_HOST@ + # Only process if target is MS-Windows if WINDOWSENV MAYBE_W32 = w32 @@ -65,9 +67,6 @@ endif # Extra stuff to include in the distribution. -# Note we need all the glob stuff here, rather than in glob/Makefile.am, -# because often that directory isn't built on the systems used by the -# maintainers. EXTRA_DIST = README build.sh.in $(man_MANS) \ README.customs README.OS2 \ @@ -79,8 +78,9 @@ EXTRA_DIST = README build.sh.in $(man_MANS) \ readme.vms makefile.vms makefile.com config.h-vms \ vmsdir.h vmsfunctions.c vmsify.c -MAKE_HOST = @MAKE_HOST@ +# This is built during configure, but behind configure's back +DISTCLEANFILES = build.sh # Forward targets diff --git a/Makefile.in b/Makefile.in index c5e9f4a8..4148c69f 100644 --- a/Makefile.in +++ b/Makefile.in @@ -279,9 +279,6 @@ man_MANS = make.1 AM_CPPFLAGS = $(GLOBINC) $(am__append_2) # Extra stuff to include in the distribution. -# Note we need all the glob stuff here, rather than in glob/Makefile.am, -# because often that directory isn't built on the systems used by the -# maintainers. EXTRA_DIST = README build.sh.in $(man_MANS) \ README.customs README.OS2 \ SCOPTIONS SMakefile \ @@ -293,6 +290,9 @@ EXTRA_DIST = README build.sh.in $(man_MANS) \ vmsdir.h vmsfunctions.c vmsify.c +# This is built during configure, but behind configure's back +DISTCLEANFILES = build.sh + # --------------- Internationalization Section localedir = $(datadir)/locale @@ -906,6 +906,7 @@ clean-generic: distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" diff --git a/NEWS b/NEWS index 1449e1b7..fdeb5be6 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,6 @@ GNU make NEWS -*-indented-text-*- History of user-visible changes. - 19 March 2006 + 1 April 2006 See the end of this file for copyrights and conditions. @@ -9,7 +9,7 @@ manual, which is contained in this distribution as the file doc/make.texi. See the README file and the GNU make manual for instructions for reporting bugs. -Version 3.81rc2 +Version 3.81 * GNU make is ported to OS/2. @@ -147,7 +147,7 @@ Version 3.81rc2 A complete list of bugs fixed in this version is available here: - http://savannah.gnu.org/bugs/index.php?group=make&report_id=111&fix_release_id=101 + http://savannah.gnu.org/bugs/index.php?group=make&report_id=111&fix_release_id=103 Version 3.80 diff --git a/README b/README index 6de9f44d..14277e5c 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -This directory contains the 3.81rc2 release of GNU Make. +This directory contains the 3.81 release of GNU Make. See the file NEWS for the user-visible changes from previous releases. In addition, there have been bugs fixed. diff --git a/README.DOS b/README.DOS index a1cd67d2..7cf6f40e 100644 --- a/README.DOS +++ b/README.DOS @@ -62,7 +62,7 @@ To build from sources: [Enter]. Otherwise, you need to supply the path to the source directory as an argument to the batch file, like this: - c:\djgpp\gnu\make-3.81rc2\configure.bat c:/djgpp/gnu/make-3.81rc2 + c:\djgpp\gnu\make-3.81\configure.bat c:/djgpp/gnu/make-3.81 Note the forward slashes in the source path argument: you MUST use them here. @@ -84,7 +84,7 @@ To build from sources: If you are building from outside of the source directory, you need to tell Make where the sources are, like this: - make srcdir=c:/djgpp/gnu/make-3.81rc2 + make srcdir=c:/djgpp/gnu/make-3.81 (configure.bat will tell you this when it finishes). You MUST use a full, not relative, name of the source directory here, or diff --git a/README.W32 b/README.W32 index 115c10d7..11e9ef8a 100644 --- a/README.W32 +++ b/README.W32 @@ -167,7 +167,7 @@ GNU make handling of drive letters in pathnames (PATH, vpath, VPATH): GNU make test suite: I verified all functionality with a slightly modified version - of make-test-3.81rc2 (modifications to get test suite to run + of make-test-3.81 (modifications to get test suite to run on Windows NT). All tests pass in an environment that includes sh.exe. Tests were performed on both Windows NT and Windows 95. diff --git a/SMakefile b/SMakefile index 0050f7d2..d60a5ce4 100644 --- a/SMakefile +++ b/SMakefile @@ -24,9 +24,9 @@ # # Ultrix 2.2 make doesn't expand the value of VPATH. -VPATH = /make-3.81rc2/ +VPATH = /make-3.81/ # This must repeat the value, because configure will remove `VPATH = .'. -srcdir = /make-3.81rc2/ +srcdir = /make-3.81/ CC = sc RM = delete diff --git a/config.ami b/config.ami index 28700ce0..d2dc5b3d 100644 --- a/config.ami +++ b/config.ami @@ -190,7 +190,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. */ #define PACKAGE "make" /* Version of this package (needed by automake) */ -#define VERSION "3.81rc2" +#define VERSION "3.81" /* Define to the name of the SCCS `get' command. */ #define SCCS_GET "get" diff --git a/config.h-vms b/config.h-vms index 93162c36..f1aaf635 100644 --- a/config.h-vms +++ b/config.h-vms @@ -213,7 +213,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. */ #define PACKAGE "make" /* Version of this package (needed by automake) */ -#define VERSION "3.81rc2" +#define VERSION "3.81" /* Define to the name of the SCCS `get' command. */ /* #undef SCCS_GET */ diff --git a/config.h.W32 b/config.h.W32 index ed4e5a77..6d140bb6 100644 --- a/config.h.W32 +++ b/config.h.W32 @@ -371,7 +371,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. */ /* #undef UMAX4_3 */ /* Version number of package */ -#define VERSION "3.81rc2" +#define VERSION "3.81" /* Define if using the dmalloc debugging malloc package */ /* #undef WITH_DMALLOC */ @@ -469,13 +469,13 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. */ * Define if you have the Cygnus "Cygwin" GNU Windows32 tool set. * Do NOT define BATCH_MODE_ONLY_SHELL if you define HAVE_CYGWIN_SHELL */ -/*#define HAVE_CYGWIN_SHELL*/ +/*#define HAVE_CYGWIN_SHELL 1 */ /* * Define if you have the MKS tool set or shell. Do NOT define * BATCH_MODE_ONLY_SHELL if you define HAVE_MKS_SHELL */ -/*#define HAVE_MKS_SHELL */ +/*#define HAVE_MKS_SHELL 1 */ /* * Enforce the mutual exclusivity restriction. diff --git a/config/Makefile.in b/config/Makefile.in index f4d17959..bb2def4c 100644 --- a/config/Makefile.in +++ b/config/Makefile.in @@ -54,7 +54,7 @@ host_triplet = @host@ subdir = config DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog \ compile config.guess config.rpath config.sub depcomp \ - install-sh missing mkinstalldirs texinfo.tex + install-sh mdate-sh missing mkinstalldirs texinfo.tex ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/dospaths.m4 \ $(top_srcdir)/config/gettext.m4 $(top_srcdir)/config/iconv.m4 \ diff --git a/config/mdate-sh b/config/mdate-sh new file mode 100755 index 00000000..cd916c0a --- /dev/null +++ b/config/mdate-sh @@ -0,0 +1,201 @@ +#!/bin/sh +# Get modification time of a file or directory and pretty-print it. + +scriptversion=2005-06-29.22 + +# Copyright (C) 1995, 1996, 1997, 2003, 2004, 2005 Free Software +# Foundation, Inc. +# written by Ulrich Drepper , June 1995 +# +# 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 +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software Foundation, +# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +# This file is maintained in Automake, please report +# bugs to or send patches to +# . + +case $1 in + '') + echo "$0: No file. Try \`$0 --help' for more information." 1>&2 + exit 1; + ;; + -h | --h*) + cat <<\EOF +Usage: mdate-sh [--help] [--version] FILE + +Pretty-print the modification time of FILE. + +Report bugs to . +EOF + exit $? + ;; + -v | --v*) + echo "mdate-sh $scriptversion" + exit $? + ;; +esac + +# Prevent date giving response in another language. +LANG=C +export LANG +LC_ALL=C +export LC_ALL +LC_TIME=C +export LC_TIME + +# GNU ls changes its time format in response to the TIME_STYLE +# variable. Since we cannot assume `unset' works, revert this +# variable to its documented default. +if test "${TIME_STYLE+set}" = set; then + TIME_STYLE=posix-long-iso + export TIME_STYLE +fi + +save_arg1=$1 + +# Find out how to get the extended ls output of a file or directory. +if ls -L /dev/null 1>/dev/null 2>&1; then + ls_command='ls -L -l -d' +else + ls_command='ls -l -d' +fi + +# A `ls -l' line looks as follows on OS/2. +# drwxrwx--- 0 Aug 11 2001 foo +# This differs from Unix, which adds ownership information. +# drwxrwx--- 2 root root 4096 Aug 11 2001 foo +# +# To find the date, we split the line on spaces and iterate on words +# until we find a month. This cannot work with files whose owner is a +# user named `Jan', or `Feb', etc. However, it's unlikely that `/' +# will be owned by a user whose name is a month. So we first look at +# the extended ls output of the root directory to decide how many +# words should be skipped to get the date. + +# On HPUX /bin/sh, "set" interprets "-rw-r--r--" as options, so the "x" below. +set x`ls -l -d /` + +# Find which argument is the month. +month= +command= +until test $month +do + shift + # Add another shift to the command. + command="$command shift;" + case $1 in + Jan) month=January; nummonth=1;; + Feb) month=February; nummonth=2;; + Mar) month=March; nummonth=3;; + Apr) month=April; nummonth=4;; + May) month=May; nummonth=5;; + Jun) month=June; nummonth=6;; + Jul) month=July; nummonth=7;; + Aug) month=August; nummonth=8;; + Sep) month=September; nummonth=9;; + Oct) month=October; nummonth=10;; + Nov) month=November; nummonth=11;; + Dec) month=December; nummonth=12;; + esac +done + +# Get the extended ls output of the file or directory. +set dummy x`eval "$ls_command \"\$save_arg1\""` + +# Remove all preceding arguments +eval $command + +# Because of the dummy argument above, month is in $2. +# +# On a POSIX system, we should have +# +# $# = 5 +# $1 = file size +# $2 = month +# $3 = day +# $4 = year or time +# $5 = filename +# +# On Darwin 7.7.0 and 7.6.0, we have +# +# $# = 4 +# $1 = day +# $2 = month +# $3 = year or time +# $4 = filename + +# Get the month. +case $2 in + Jan) month=January; nummonth=1;; + Feb) month=February; nummonth=2;; + Mar) month=March; nummonth=3;; + Apr) month=April; nummonth=4;; + May) month=May; nummonth=5;; + Jun) month=June; nummonth=6;; + Jul) month=July; nummonth=7;; + Aug) month=August; nummonth=8;; + Sep) month=September; nummonth=9;; + Oct) month=October; nummonth=10;; + Nov) month=November; nummonth=11;; + Dec) month=December; nummonth=12;; +esac + +case $3 in + ???*) day=$1;; + *) day=$3; shift;; +esac + +# Here we have to deal with the problem that the ls output gives either +# the time of day or the year. +case $3 in + *:*) set `date`; eval year=\$$# + case $2 in + Jan) nummonthtod=1;; + Feb) nummonthtod=2;; + Mar) nummonthtod=3;; + Apr) nummonthtod=4;; + May) nummonthtod=5;; + Jun) nummonthtod=6;; + Jul) nummonthtod=7;; + Aug) nummonthtod=8;; + Sep) nummonthtod=9;; + Oct) nummonthtod=10;; + Nov) nummonthtod=11;; + Dec) nummonthtod=12;; + esac + # For the first six month of the year the time notation can also + # be used for files modified in the last year. + if (expr $nummonth \> $nummonthtod) > /dev/null; + then + year=`expr $year - 1` + fi;; + *) year=$3;; +esac + +# The result. +echo $day $month $year + +# 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: diff --git a/config/texinfo.tex b/config/texinfo.tex index dddd0140..7ed20f01 100644 --- a/config/texinfo.tex +++ b/config/texinfo.tex @@ -3,7 +3,7 @@ % Load plain if necessary, i.e., if running under initex. \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi % -\def\texinfoversion{2006-02-13.16} +\def\texinfoversion{2006-03-21.13} % % Copyright (C) 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995, % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free @@ -385,7 +385,7 @@ % \def\parsearg{\parseargusing{}} \def\parseargusing#1#2{% - \def\next{#2}% + \def\argtorun{#2}% \begingroup \obeylines \spaceisspace @@ -416,8 +416,7 @@ \def\argcheckspacesY#1\^^M#2\^^M#3\ArgTerm{% \def\temp{#3}% \ifx\temp\empty - % We cannot use \next here, as it holds the macro to run; - % thus we reuse \temp. + % Do not use \next, perhaps the caller of \parsearg uses it; reuse \temp: \let\temp\finishparsearg \else \let\temp\argcheckspaces @@ -429,14 +428,14 @@ % If a _delimited_ argument is enclosed in braces, they get stripped; so % to get _exactly_ the rest of the line, we had to prevent such situation. % We prepended an \empty token at the very beginning and we expand it now, -% just before passing the control to \next. +% just before passing the control to \argtorun. % (Similarily, we have to think about #3 of \argcheckspacesY above: it is % either the null string, or it ends with \^^M---thus there is no danger % that a pair of braces would be stripped. % % But first, we have to remove the trailing space token. % -\def\finishparsearg#1 \ArgTerm{\expandafter\next\expandafter{#1}} +\def\finishparsearg#1 \ArgTerm{\expandafter\argtorun\expandafter{#1}} % \parseargdef\foo{...} % is roughly equivalent to @@ -5928,11 +5927,11 @@ where each line of input produces a line of output.} % {. If so it reads up to the closing }, if not, it reads the whole % line. Whatever was read is then fed to the next control sequence % as an argument (by \parsebrace or \parsearg) -\def\braceorline#1{\let\next=#1\futurelet\nchar\braceorlinexxx} +\def\braceorline#1{\let\macnamexxx=#1\futurelet\nchar\braceorlinexxx} \def\braceorlinexxx{% \ifx\nchar\bgroup\else \expandafter\parsearg - \fi \next} + \fi \macnamexxx} % @alias. diff --git a/configh.dos b/configh.dos index 96cb52bc..05c3e3a3 100644 --- a/configh.dos +++ b/configh.dos @@ -93,13 +93,13 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. */ #define PACKAGE_NAME "GNU make" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "GNU make 3.81rc2" +#define PACKAGE_STRING "GNU make 3.81" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "make" /* Define to the version of this package. */ -#define PACKAGE_VERSION "3.81rc2" +#define PACKAGE_VERSION "3.81" /* Define to 1 if the C compiler supports function prototypes. */ #define PROTOTYPES 1 @@ -108,7 +108,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. */ #define SYS_SIGLIST_DECLARED 1 /* Version number of package */ -#define VERSION "3.81rc2" +#define VERSION "3.81" /* Build host information. */ #define MAKE_HOST "i386-pc-msdosdjgpp" diff --git a/configure b/configure index 84be7a0c..a1fa5290 100755 --- a/configure +++ b/configure @@ -1,7 +1,7 @@ #! /bin/sh -# From configure.in Id: configure.in,v 1.141 2006/03/10 02:20:45 psmith Exp . +# From configure.in Id: configure.in,v 1.142 2006/04/01 06:36:40 psmith Exp . # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for GNU make 3.81rc2. +# Generated by GNU Autoconf 2.59 for GNU make 3.81. # # Report bugs to . # @@ -270,8 +270,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='GNU make' PACKAGE_TARNAME='make' -PACKAGE_VERSION='3.81rc2' -PACKAGE_STRING='GNU make 3.81rc2' +PACKAGE_VERSION='3.81' +PACKAGE_STRING='GNU make 3.81' PACKAGE_BUGREPORT='bug-make@gnu.org' ac_unique_file="vpath.c" @@ -781,7 +781,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures GNU make 3.81rc2 to adapt to many kinds of systems. +\`configure' configures GNU make 3.81 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -847,7 +847,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of GNU make 3.81rc2:";; + short | recursive ) echo "Configuration of GNU make 3.81:";; esac cat <<\_ACEOF @@ -983,7 +983,7 @@ fi test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -GNU make configure 3.81rc2 +GNU make configure 3.81 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -997,7 +997,7 @@ cat >&5 <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by GNU make $as_me 3.81rc2, which was +It was created by GNU make $as_me 3.81, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -1650,7 +1650,7 @@ fi # Define the identity of the package. PACKAGE='make' - VERSION='3.81rc2' + VERSION='3.81' cat >>confdefs.h <<_ACEOF @@ -14195,7 +14195,7 @@ _ASBOX } >&5 cat >&5 <<_CSEOF -This file was extended by GNU make $as_me 3.81rc2, which was +This file was extended by GNU make $as_me 3.81, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -14258,7 +14258,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -GNU make config.status 3.81rc2 +GNU make config.status 3.81 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" @@ -15381,7 +15381,7 @@ fi # We only generate the build.sh if we have a build.sh.in; we won't have # one before we've created a distribution. -if test -f build.sh.in; then +if test -f "$srcdir/build.sh.in"; then ./config.status --file build.sh chmod +x build.sh fi diff --git a/configure.in b/configure.in index 882a738f..a3a60a64 100644 --- a/configure.in +++ b/configure.in @@ -16,10 +16,10 @@ # GNU Make; see the file COPYING. If not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -AC_INIT([GNU make],[3.81rc2],[bug-make@gnu.org]) +AC_INIT([GNU make],[3.81],[bug-make@gnu.org]) AC_PREREQ(2.59) -AC_REVISION([[$Id: configure.in,v 1.141 2006/03/10 02:20:45 psmith Exp $]]) +AC_REVISION([[$Id: configure.in,v 1.142 2006/04/01 06:36:40 psmith Exp $]]) # Autoconf setup AC_CONFIG_AUX_DIR(config) @@ -450,7 +450,7 @@ AC_OUTPUT # We only generate the build.sh if we have a build.sh.in; we won't have # one before we've created a distribution. -if test -f build.sh.in; then +if test -f "$srcdir/build.sh.in"; then ./config.status --file build.sh chmod +x build.sh fi diff --git a/doc/Makefile.in b/doc/Makefile.in index f842a81d..3057f743 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -54,7 +54,8 @@ build_triplet = @build@ host_triplet = @host@ subdir = doc DIST_COMMON = $(make_TEXINFOS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in + $(srcdir)/Makefile.in $(srcdir)/stamp-vti \ + $(srcdir)/version.texi ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/dospaths.m4 \ $(top_srcdir)/config/gettext.m4 $(top_srcdir)/config/iconv.m4 \ @@ -279,10 +280,29 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) rm -rf $(@:.html=); else rm -Rf $(@:.html=.htp) $@; fi; \ exit 1; \ fi -$(srcdir)/make.info: make.texi $(make_TEXINFOS) -make.dvi: make.texi $(make_TEXINFOS) -make.pdf: make.texi $(make_TEXINFOS) -make.html: make.texi $(make_TEXINFOS) +$(srcdir)/make.info: make.texi $(srcdir)/version.texi $(make_TEXINFOS) +make.dvi: make.texi $(srcdir)/version.texi $(make_TEXINFOS) +make.pdf: make.texi $(srcdir)/version.texi $(make_TEXINFOS) +make.html: make.texi $(srcdir)/version.texi $(make_TEXINFOS) +$(srcdir)/version.texi: $(srcdir)/stamp-vti +$(srcdir)/stamp-vti: make.texi $(top_srcdir)/configure + @(dir=.; test -f ./make.texi || dir=$(srcdir); \ + set `$(SHELL) $(top_srcdir)/config/mdate-sh $$dir/make.texi`; \ + echo "@set UPDATED $$1 $$2 $$3"; \ + echo "@set UPDATED-MONTH $$2 $$3"; \ + echo "@set EDITION $(VERSION)"; \ + echo "@set VERSION $(VERSION)") > vti.tmp + @cmp -s vti.tmp $(srcdir)/version.texi \ + || (echo "Updating $(srcdir)/version.texi"; \ + cp vti.tmp $(srcdir)/version.texi) + -@rm -f vti.tmp + @cp $(srcdir)/version.texi $@ + +mostlyclean-vti: + -rm -f vti.tmp + +maintainer-clean-vti: + -rm -f $(srcdir)/stamp-vti $(srcdir)/version.texi .dvi.ps: TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \ $(DVIPS) -o $@ $< @@ -465,11 +485,11 @@ installcheck-am: maintainer-clean: maintainer-clean-am -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-aminfo \ - maintainer-clean-generic + maintainer-clean-generic maintainer-clean-vti mostlyclean: mostlyclean-am -mostlyclean-am: mostlyclean-aminfo mostlyclean-generic +mostlyclean-am: mostlyclean-aminfo mostlyclean-generic mostlyclean-vti pdf: pdf-am @@ -487,9 +507,9 @@ uninstall-am: uninstall-info-am install-exec install-exec-am install-info install-info-am \ install-man install-strip installcheck installcheck-am \ installdirs maintainer-clean maintainer-clean-aminfo \ - maintainer-clean-generic mostlyclean mostlyclean-aminfo \ - mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am \ - uninstall-info-am + maintainer-clean-generic maintainer-clean-vti mostlyclean \ + mostlyclean-aminfo mostlyclean-generic mostlyclean-vti pdf \ + pdf-am ps ps-am uninstall uninstall-am uninstall-info-am html: make_1.html diff --git a/doc/make.info b/doc/make.info index 2665353a..d43f032f 100644 --- a/doc/make.info +++ b/doc/make.info @@ -1,179 +1,184 @@ This is make.info, produced by makeinfo version 4.8 from make.texi. + This file documents the GNU `make' utility, which determines +automatically which pieces of a large program need to be recompiled, +and issues the commands to recompile them. + + This is Edition 0.70, last updated 1 April 2006, of `The GNU Make +Manual', for GNU `make' version 3.81. + + Copyright (C) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, +1997, 1998, 1999, 2000, 2002, 2003, 2004, 2005, 2006 Free Software +Foundation, Inc. + + Permission is granted to copy, distribute and/or modify this + document under the terms of the GNU Free Documentation License, + Version 1.2 or any later version published by the Free Software + Foundation; with no Invariant Sections, with the Front-Cover Texts + being "A GNU Manual," and with the Back-Cover Texts as in (a) + below. A copy of the license is included in the section entitled + "GNU Free Documentation License." + + (a) The FSF's Back-Cover Text is: "You have freedom to copy and + modify this GNU Manual, like GNU software. Copies published by + the Free Software Foundation raise funds for GNU development." + INFO-DIR-SECTION GNU Packages START-INFO-DIR-ENTRY * Make: (make). Remake files automatically. END-INFO-DIR-ENTRY - This file documents the GNU Make utility, which determines -automatically which pieces of a large program need to be recompiled, -and issues the commands to recompile them. - - This is Edition 0.70, last updated 5 Feb 2006, of `The GNU Make -Manual', for `make', Version 3.81. - - Copyright 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, -1998, 1999, 2000, 2002, 2003, 2004, 2005, 2006 Free Software -Foundation, Inc. - - Permission is granted to copy, distribute and/or modify this document -under the terms of the GNU Free Documentation License, Version 1.1 or -any later version published by the Free Software Foundation; with no -Invariant Sections, with no Front-Cover Texts, and with no Back-Cover -Texts. A copy of the license is included in the section entitled "GNU -Free Documentation License". -  Indirect: -make.info-1: 1008 -make.info-2: 300185 +make.info-1: 1297 +make.info-2: 301265  Tag Table: (Indirect) -Node: Top1008 -Node: Overview13622 -Node: Preparing14632 -Node: Reading15604 -Node: Bugs16531 -Node: Introduction18361 -Node: Rule Introduction19953 -Node: Simple Makefile21697 -Node: How Make Works25326 -Node: Variables Simplify27981 -Node: make Deduces30187 -Node: Combine By Prerequisite31927 -Node: Cleanup32956 -Node: Makefiles34375 -Node: Makefile Contents35341 -Node: Makefile Names38296 -Node: Include39907 -Ref: Include-Footnote-143539 -Node: MAKEFILES Variable43673 -Node: MAKEFILE_LIST Variable45183 -Node: Special Variables46451 -Node: Remaking Makefiles49958 -Node: Overriding Makefiles54207 -Node: Reading Makefiles56260 -Node: Secondary Expansion59164 -Node: Rules66598 -Node: Rule Example69270 -Node: Rule Syntax70127 -Node: Prerequisite Types72630 -Node: Wildcards74406 -Node: Wildcard Examples76124 -Node: Wildcard Pitfall77380 -Node: Wildcard Function79169 -Node: Directory Search80953 -Node: General Search82095 -Node: Selective Search83810 -Node: Search Algorithm86798 -Node: Commands/Search89317 -Node: Implicit/Search90663 -Node: Libraries/Search91607 -Node: Phony Targets93699 -Node: Force Targets98785 -Node: Empty Targets99830 -Node: Special Targets101128 -Node: Multiple Targets108302 -Node: Multiple Rules110177 -Node: Static Pattern112413 -Node: Static Usage113065 -Node: Static versus Implicit116786 -Node: Double-Colon118530 -Node: Automatic Prerequisites120187 -Node: Commands124465 -Node: Command Syntax125673 -Node: Splitting Lines127698 -Node: Variables in Commands130679 -Node: Echoing132006 -Node: Execution133298 -Ref: Execution-Footnote-1134549 -Node: Choosing the Shell134695 -Node: Parallel138664 -Node: Errors142257 -Node: Interrupts145903 -Node: Recursion147490 -Node: MAKE Variable149584 -Node: Variables/Recursion151851 -Node: Options/Recursion157292 -Node: -w Option162457 -Node: Sequences163452 -Node: Empty Commands166464 -Node: Using Variables167638 -Node: Reference170751 -Node: Flavors172310 -Node: Advanced178048 -Node: Substitution Refs178553 -Node: Computed Names180106 -Node: Values184650 -Node: Setting185563 -Node: Appending187599 -Node: Override Directive191525 -Node: Defining192909 -Node: Environment195373 -Node: Target-specific197622 -Node: Pattern-specific200589 -Node: Conditionals201991 -Node: Conditional Example202701 -Node: Conditional Syntax205278 -Node: Testing Flags211003 -Node: Functions212105 -Node: Syntax of Functions213525 -Node: Text Functions215724 -Node: File Name Functions224295 -Node: Conditional Functions229517 -Node: Foreach Function231891 -Node: Call Function235103 -Node: Value Function237988 -Node: Eval Function239425 -Node: Origin Function241699 -Node: Flavor Function244917 -Node: Shell Function245983 -Node: Make Control Functions247617 -Node: Running249286 -Node: Makefile Arguments251275 -Node: Goals251991 -Node: Instead of Execution256732 -Node: Avoiding Compilation260018 -Node: Overriding261993 -Node: Testing264291 -Node: Options Summary266176 -Node: Implicit Rules276302 -Node: Using Implicit278450 -Node: Catalogue of Rules281989 -Node: Implicit Variables291339 -Node: Chained Rules296174 -Node: Pattern Rules300185 -Node: Pattern Intro301721 -Node: Pattern Examples304618 -Node: Automatic Variables306427 -Node: Pattern Match313798 -Node: Match-Anything Rules315434 -Node: Canceling Rules319309 -Node: Last Resort320025 -Node: Suffix Rules321872 -Node: Implicit Rule Search325601 -Node: Archives329120 -Node: Archive Members329818 -Node: Archive Update331431 -Node: Archive Symbols333345 -Node: Archive Pitfalls334579 -Node: Archive Suffix Rules335302 -Node: Features336849 -Node: Missing345404 -Node: Makefile Conventions349142 -Node: Makefile Basics349928 -Node: Utilities in Makefiles353095 -Node: Command Variables355233 -Node: Directory Variables358803 -Node: Standard Targets372943 -Ref: Standard Targets-Footnote-1386062 -Node: Install Command Categories386162 -Node: Quick Reference390688 -Node: Error Messages401384 -Node: Complex Makefile409074 -Node: GNU Free Documentation License417792 -Node: Concept Index440241 -Node: Name Index505430 +Node: Top1297 +Node: Overview14702 +Node: Preparing15712 +Node: Reading16684 +Node: Bugs17611 +Node: Introduction19441 +Node: Rule Introduction21033 +Node: Simple Makefile22777 +Node: How Make Works26406 +Node: Variables Simplify29061 +Node: make Deduces31267 +Node: Combine By Prerequisite33007 +Node: Cleanup34036 +Node: Makefiles35455 +Node: Makefile Contents36421 +Node: Makefile Names39376 +Node: Include40987 +Ref: Include-Footnote-144619 +Node: MAKEFILES Variable44753 +Node: MAKEFILE_LIST Variable46263 +Node: Special Variables47531 +Node: Remaking Makefiles51038 +Node: Overriding Makefiles55287 +Node: Reading Makefiles57340 +Node: Secondary Expansion60244 +Node: Rules67678 +Node: Rule Example70350 +Node: Rule Syntax71207 +Node: Prerequisite Types73710 +Node: Wildcards75486 +Node: Wildcard Examples77204 +Node: Wildcard Pitfall78460 +Node: Wildcard Function80249 +Node: Directory Search82033 +Node: General Search83175 +Node: Selective Search84890 +Node: Search Algorithm87878 +Node: Commands/Search90397 +Node: Implicit/Search91743 +Node: Libraries/Search92687 +Node: Phony Targets94779 +Node: Force Targets99865 +Node: Empty Targets100910 +Node: Special Targets102208 +Node: Multiple Targets109382 +Node: Multiple Rules111257 +Node: Static Pattern113493 +Node: Static Usage114145 +Node: Static versus Implicit117866 +Node: Double-Colon119610 +Node: Automatic Prerequisites121267 +Node: Commands125545 +Node: Command Syntax126753 +Node: Splitting Lines128778 +Node: Variables in Commands131759 +Node: Echoing133086 +Node: Execution134378 +Ref: Execution-Footnote-1135629 +Node: Choosing the Shell135775 +Node: Parallel139744 +Node: Errors143337 +Node: Interrupts146983 +Node: Recursion148570 +Node: MAKE Variable150664 +Node: Variables/Recursion152931 +Node: Options/Recursion158372 +Node: -w Option163537 +Node: Sequences164532 +Node: Empty Commands167544 +Node: Using Variables168718 +Node: Reference171831 +Node: Flavors173390 +Node: Advanced179128 +Node: Substitution Refs179633 +Node: Computed Names181186 +Node: Values185730 +Node: Setting186643 +Node: Appending188679 +Node: Override Directive192605 +Node: Defining193989 +Node: Environment196453 +Node: Target-specific198702 +Node: Pattern-specific201669 +Node: Conditionals203071 +Node: Conditional Example203781 +Node: Conditional Syntax206358 +Node: Testing Flags212083 +Node: Functions213185 +Node: Syntax of Functions214605 +Node: Text Functions216804 +Node: File Name Functions225375 +Node: Conditional Functions230597 +Node: Foreach Function232971 +Node: Call Function236183 +Node: Value Function239068 +Node: Eval Function240505 +Node: Origin Function242779 +Node: Flavor Function245997 +Node: Shell Function247063 +Node: Make Control Functions248697 +Node: Running250366 +Node: Makefile Arguments252355 +Node: Goals253071 +Node: Instead of Execution257812 +Node: Avoiding Compilation261098 +Node: Overriding263073 +Node: Testing265371 +Node: Options Summary267256 +Node: Implicit Rules277382 +Node: Using Implicit279530 +Node: Catalogue of Rules283069 +Node: Implicit Variables292419 +Node: Chained Rules297254 +Node: Pattern Rules301265 +Node: Pattern Intro302801 +Node: Pattern Examples305698 +Node: Automatic Variables307507 +Node: Pattern Match314878 +Node: Match-Anything Rules316514 +Node: Canceling Rules320389 +Node: Last Resort321105 +Node: Suffix Rules322952 +Node: Implicit Rule Search326681 +Node: Archives330200 +Node: Archive Members330898 +Node: Archive Update332511 +Node: Archive Symbols334425 +Node: Archive Pitfalls335659 +Node: Archive Suffix Rules336382 +Node: Features337929 +Node: Missing346484 +Node: Makefile Conventions350222 +Node: Makefile Basics351008 +Node: Utilities in Makefiles354175 +Node: Command Variables356313 +Node: Directory Variables359883 +Node: Standard Targets374023 +Ref: Standard Targets-Footnote-1387142 +Node: Install Command Categories387242 +Node: Quick Reference391768 +Node: Error Messages402464 +Node: Complex Makefile410154 +Node: GNU Free Documentation License418872 +Node: Concept Index441321 +Node: Name Index506510  End Tag Table diff --git a/doc/make.info-1 b/doc/make.info-1 index fd4cfa02..486df365 100644 --- a/doc/make.info-1 +++ b/doc/make.info-1 @@ -1,42 +1,61 @@ This is make.info, produced by makeinfo version 4.8 from make.texi. + This file documents the GNU `make' utility, which determines +automatically which pieces of a large program need to be recompiled, +and issues the commands to recompile them. + + This is Edition 0.70, last updated 1 April 2006, of `The GNU Make +Manual', for GNU `make' version 3.81. + + Copyright (C) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, +1997, 1998, 1999, 2000, 2002, 2003, 2004, 2005, 2006 Free Software +Foundation, Inc. + + Permission is granted to copy, distribute and/or modify this + document under the terms of the GNU Free Documentation License, + Version 1.2 or any later version published by the Free Software + Foundation; with no Invariant Sections, with the Front-Cover Texts + being "A GNU Manual," and with the Back-Cover Texts as in (a) + below. A copy of the license is included in the section entitled + "GNU Free Documentation License." + + (a) The FSF's Back-Cover Text is: "You have freedom to copy and + modify this GNU Manual, like GNU software. Copies published by + the Free Software Foundation raise funds for GNU development." + INFO-DIR-SECTION GNU Packages START-INFO-DIR-ENTRY * Make: (make). Remake files automatically. END-INFO-DIR-ENTRY - This file documents the GNU Make utility, which determines -automatically which pieces of a large program need to be recompiled, -and issues the commands to recompile them. - - This is Edition 0.70, last updated 5 Feb 2006, of `The GNU Make -Manual', for `make', Version 3.81. - - Copyright 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, -1998, 1999, 2000, 2002, 2003, 2004, 2005, 2006 Free Software -Foundation, Inc. - - Permission is granted to copy, distribute and/or modify this document -under the terms of the GNU Free Documentation License, Version 1.1 or -any later version published by the Free Software Foundation; with no -Invariant Sections, with no Front-Cover Texts, and with no Back-Cover -Texts. A copy of the license is included in the section entitled "GNU -Free Documentation License". -  File: make.info, Node: Top, Next: Overview, Prev: (dir), Up: (dir) -Make -**** +GNU `make' +********** -The GNU `make' utility automatically determines which pieces of a large -program need to be recompiled, and issues the commands to recompile -them. +This file documents the GNU `make' utility, which determines +automatically which pieces of a large program need to be recompiled, +and issues the commands to recompile them. - This edition of the `GNU Make Manual', last updated 5 Feb 2006, -documents GNU `make' Version 3.81. + This is Edition 0.70, last updated 1 April 2006, of `The GNU Make +Manual', for GNU `make' version 3.81. - This manual describes `make' and contains the following chapters: + Copyright (C) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, +1997, 1998, 1999, 2000, 2002, 2003, 2004, 2005, 2006 Free Software +Foundation, Inc. + + Permission is granted to copy, distribute and/or modify this + document under the terms of the GNU Free Documentation License, + Version 1.2 or any later version published by the Free Software + Foundation; with no Invariant Sections, with the Front-Cover Texts + being "A GNU Manual," and with the Back-Cover Texts as in (a) + below. A copy of the license is included in the section entitled + "GNU Free Documentation License." + + (a) The FSF's Back-Cover Text is: "You have freedom to copy and + modify this GNU Manual, like GNU software. Copies published by + the Free Software Foundation raise funds for GNU development." * Menu: diff --git a/doc/make.info-2 b/doc/make.info-2 index f2989474..19727b29 100644 --- a/doc/make.info-2 +++ b/doc/make.info-2 @@ -1,28 +1,33 @@ This is make.info, produced by makeinfo version 4.8 from make.texi. + This file documents the GNU `make' utility, which determines +automatically which pieces of a large program need to be recompiled, +and issues the commands to recompile them. + + This is Edition 0.70, last updated 1 April 2006, of `The GNU Make +Manual', for GNU `make' version 3.81. + + Copyright (C) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, +1997, 1998, 1999, 2000, 2002, 2003, 2004, 2005, 2006 Free Software +Foundation, Inc. + + Permission is granted to copy, distribute and/or modify this + document under the terms of the GNU Free Documentation License, + Version 1.2 or any later version published by the Free Software + Foundation; with no Invariant Sections, with the Front-Cover Texts + being "A GNU Manual," and with the Back-Cover Texts as in (a) + below. A copy of the license is included in the section entitled + "GNU Free Documentation License." + + (a) The FSF's Back-Cover Text is: "You have freedom to copy and + modify this GNU Manual, like GNU software. Copies published by + the Free Software Foundation raise funds for GNU development." + INFO-DIR-SECTION GNU Packages START-INFO-DIR-ENTRY * Make: (make). Remake files automatically. END-INFO-DIR-ENTRY - This file documents the GNU Make utility, which determines -automatically which pieces of a large program need to be recompiled, -and issues the commands to recompile them. - - This is Edition 0.70, last updated 5 Feb 2006, of `The GNU Make -Manual', for `make', Version 3.81. - - Copyright 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, -1998, 1999, 2000, 2002, 2003, 2004, 2005, 2006 Free Software -Foundation, Inc. - - Permission is granted to copy, distribute and/or modify this document -under the terms of the GNU Free Documentation License, Version 1.1 or -any later version published by the Free Software Foundation; with no -Invariant Sections, with no Front-Cover Texts, and with no Back-Cover -Texts. A copy of the license is included in the section entitled "GNU -Free Documentation License". -  File: make.info, Node: Pattern Rules, Next: Last Resort, Prev: Chained Rules, Up: Implicit Rules diff --git a/doc/make.texi b/doc/make.texi index d14a07f9..be22ea35 100644 --- a/doc/make.texi +++ b/doc/make.texi @@ -1,55 +1,60 @@ \input texinfo @c -*- Texinfo -*- @c %**start of header @setfilename make.info + +@include version.texi +@set EDITION 0.70 +@set RCSID $Id: make.texi,v 1.45 2006/04/01 06:36:40 psmith Exp $ + @settitle GNU @code{make} @setchapternewpage odd -@c %**end of header - +@c Combine the variable and function indices: +@syncodeindex vr fn +@c Combine the program and concept indices: +@syncodeindex pg cp @c FSF publishers: format makebook.texi instead of using this file directly. - -@set RCSID $Id: make.texi,v 1.44 2006/02/14 15:42:18 psmith Exp $ -@set EDITION 0.70 -@set VERSION 3.81 -@set UPDATED 5 Feb 2006 -@set UPDATE-MONTH Feb 2006 @c ISBN provided by Lisa M. Opus Goldstein , 5 May 2004 @set ISBN 1-882114-83-5 +@c %**end of header + +@copying +This file documents the GNU @code{make} utility, which determines +automatically which pieces of a large program need to be recompiled, +and issues the commands to recompile them. + +This is Edition @value{EDITION}, last updated @value{UPDATED}, +of @cite{The GNU Make Manual}, for GNU @code{make} version @value{VERSION}. + +Copyright @copyright{} 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, +1996, 1997, 1998, 1999, 2000, 2002, 2003, 2004, 2005, 2006 +Free Software Foundation, Inc. + +@quotation +Permission is granted to copy, distribute and/or modify this document +under the terms of the GNU Free Documentation License, Version 1.2 or +any later version published by the Free Software Foundation; with no +Invariant Sections, with the Front-Cover Texts being ``A GNU Manual,'' +and with the Back-Cover Texts as in (a) below. A copy of the +license is included in the section entitled ``GNU Free Documentation +License.'' + +(a) The FSF's Back-Cover Text is: ``You have freedom to copy and modify +this GNU Manual, like GNU software. Copies published by the Free +Software Foundation raise funds for GNU development.'' +@end quotation +@end copying @c finalout @c ISPELL CHECK: done, 10 June 1993 --roland @c ISPELL CHECK: done, 2000-06-25 --Martin Buchholz -@c Combine the variable and function indices: -@syncodeindex vr fn -@c Combine the program and concept indices: -@syncodeindex pg cp @dircategory GNU Packages @direntry * Make: (make). Remake files automatically. @end direntry -@ifnottex -This file documents the GNU Make utility, which determines -automatically which pieces of a large program need to be recompiled, -and issues the commands to recompile them. - -This is Edition @value{EDITION}, last updated @value{UPDATED}, -of @cite{The GNU Make Manual}, for @code{make}, Version @value{VERSION}. - -Copyright 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, -1998, 1999, 2000, 2002, 2003, 2004, 2005, 2006 -Free Software Foundation, Inc. - -Permission is granted to copy, distribute and/or modify this document -under the terms of the GNU Free Documentation License, Version 1.1 or -any later version published by the Free Software Foundation; with no -Invariant Sections, with no Front-Cover Texts, and with no Back-Cover -Texts. A copy of the license is included in the section entitled -``GNU Free Documentation License''. -@end ifnottex - @iftex @shorttitlepage GNU Make @end iftex @@ -57,52 +62,28 @@ Texts. A copy of the license is included in the section entitled @title GNU Make @subtitle A Program for Directing Recompilation @subtitle GNU @code{make} Version @value{VERSION} -@subtitle @value{UPDATE-MONTH} +@subtitle @value{UPDATED-MONTH} @author Richard M. Stallman, Roland McGrath, Paul D. Smith @page @vskip 0pt plus 1filll -Copyright @copyright{} 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, -1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 -Free Software Foundation, Inc. +@insertcopying @sp 2 Published by the Free Software Foundation @* 51 Franklin St. -- Fifth Floor @* Boston, MA 02110-1301 USA @* ISBN @value{ISBN} @* - -Permission is granted to copy, distribute and/or modify this document -under the terms of the GNU Free Documentation License, Version 1.1 or -any later version published by the Free Software Foundation; with the -Invariant Sections being ``GNU General Public License'', the Front-Cover -Texts being ``A GNU Manual'', and with the Back-Cover Texts being as in -(a) below. A copy of the license is included in the section entitled -``GNU Free Documentation License''. - -(a) The FSF's Back-Cover Text is: - -@quotation - You have freedom to copy and modify this GNU Manual, like GNU - software. Copies published by the Free Software Foundation raise - funds for GNU development. -@end quotation @sp 2 Cover art by Etienne Suvasa. @end titlepage -@page + +@summarycontents +@contents @ifnottex @node Top, Overview, (dir), (dir) -@top Make +@top GNU @code{make} -The GNU @code{make} utility automatically determines which pieces of a -large program need to be recompiled, and issues the commands to -recompile them.@refill - -This edition of the @cite{GNU Make Manual}, -last updated @value{UPDATED}, -documents GNU @code{make} Version @value{VERSION}.@refill - -This manual describes @code{make} and contains the following chapters:@refill +@insertcopying @end ifnottex @menu @@ -11120,6 +11101,4 @@ tar.zoo: $(SRCS) $(AUX) @printindex fn -@summarycontents -@contents @bye diff --git a/doc/stamp-vti b/doc/stamp-vti new file mode 100644 index 00000000..f75ce931 --- /dev/null +++ b/doc/stamp-vti @@ -0,0 +1,4 @@ +@set UPDATED 1 April 2006 +@set UPDATED-MONTH April 2006 +@set EDITION 3.81 +@set VERSION 3.81 diff --git a/doc/version.texi b/doc/version.texi new file mode 100644 index 00000000..f75ce931 --- /dev/null +++ b/doc/version.texi @@ -0,0 +1,4 @@ +@set UPDATED 1 April 2006 +@set UPDATED-MONTH April 2006 +@set EDITION 3.81 +@set VERSION 3.81 diff --git a/function.c b/function.c index 07cbbffd..c62f7abc 100644 --- a/function.c +++ b/function.c @@ -1390,8 +1390,8 @@ func_value (char *o, char **argv, const char *funcname UNUSED) /* \r is replaced on UNIX as well. Is this desirable? */ -void -fold_newlines (char *buffer, int *length) +static void +fold_newlines (char *buffer, unsigned int *length) { char *dst = buffer; char *src = buffer; @@ -1578,7 +1578,6 @@ static char * func_shell (char *o, char **argv, const char *funcname UNUSED) { char* batch_filename = NULL; - unsigned int i; #ifdef __MSDOS__ FILE *fpipe; @@ -1672,9 +1671,8 @@ func_shell (char *o, char **argv, const char *funcname UNUSED) #endif { /* We are the parent. */ - char *buffer; - unsigned int maxlen; + unsigned int maxlen, i; int cc; /* Record the PID for reap_children. */ @@ -1737,17 +1735,15 @@ func_shell (char *o, char **argv, const char *funcname UNUSED) if (shell_function_completed == -1) { - /* This most likely means that the execvp failed, - so we should just write out the error message - that came in over the pipe from the child. */ + /* This likely means that the execvp failed, so we should just + write the error message in the pipe from the child. */ fputs (buffer, stderr); fflush (stderr); } else { - /* The child finished normally. Replace all - newlines in its output with spaces, and put - that in the variable output buffer. */ + /* The child finished normally. Replace all newlines in its output + with spaces, and put that in the variable output buffer. */ fold_newlines (buffer, &i); o = variable_buffer_output (o, buffer, i); } @@ -1779,8 +1775,8 @@ func_shell (char *o, char **argv, const char *funcname) BPTR child_stdout; char tmp_output[FILENAME_MAX]; - unsigned int maxlen = 200; - int cc, i; + unsigned int maxlen = 200, i; + int cc; char * buffer, * ptr; char ** aptr; int len = 0; diff --git a/implicit.c b/implicit.c index a5d37008..014828fe 100644 --- a/implicit.c +++ b/implicit.c @@ -356,9 +356,8 @@ pattern_search (struct file *file, int archive, /* Didn't find it yet: check for DOS-type directories. */ if (check_lastslash) { - char *b = strrchr (target, '\\'); - check_lastslash = !(b ? b > lastslash - : (target[0] && target[1] == ':')); + char *b = strchr (target, '\\'); + check_lastslash = !(b || (target[0] && target[1] == ':')); } #endif #endif @@ -442,6 +441,7 @@ pattern_search (struct file *file, int archive, struct file *f; unsigned int failed = 0; int check_lastslash; + int file_variables_set = 0; rule = tryrules[i]; @@ -479,9 +479,9 @@ pattern_search (struct file *file, int archive, strncpy (stem_str, stem, stemlen); stem_str[stemlen] = '\0'; - /* Temporary assign STEM to file->stem and set file variables. */ + /* Temporary assign STEM to file->stem (needed to set file + variables below). */ file->stem = stem_str; - set_file_variables (file); /* Try each dependency; see if it "exists". */ @@ -550,6 +550,15 @@ pattern_search (struct file *file, int archive, depname[len] = '\0'; } + /* Set file variables. Note that we cannot do it once + at the beginning of the function because of the stem + value. */ + if (!file_variables_set) + { + set_file_variables (file); + file_variables_set = 1; + } + p2 = variable_expand_for_file (depname, file); } else diff --git a/misc.c b/misc.c index 082bcc67..07f3c016 100644 --- a/misc.c +++ b/misc.c @@ -634,7 +634,7 @@ static enum { make, user } current_access; /* Under -d, write a message describing the current IDs. */ static void -log_access (char *flavor) +log_access (const char *flavor) { if (! ISDB (DB_JOBS)) return; diff --git a/po/be.gmo b/po/be.gmo index b086baf149d9ba847e1cd2837268ec85183409e6..daf42adbd1012e4f4c5f10fdadccd76030d786fa 100644 GIT binary patch delta 23 ecmcbXdM$OsCP^+6T?0b}14AnlgUx#+r6d7s=m(ep delta 23 ecmcbXdM$OsCP^-1T|-L+BO@yV^UZrCr6d7taR;UV diff --git a/po/be.po b/po/be.po index 846513c4..fd0a4cd3 100644 --- a/po/be.po +++ b/po/be.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: make 3.80\n" "Report-Msgid-Bugs-To: bug-make@gnu.org\n" -"POT-Creation-Date: 2006-03-19 22:07-0500\n" +"POT-Creation-Date: 2006-04-01 01:40-0500\n" "PO-Revision-Date: 2003-10-21 11:50+0300\n" "Last-Translator: Ales Nyakhaychyk \n" "Language-Team: Belarusian \n" @@ -384,22 +384,22 @@ msgstr "памылка ў CreatePipe() (e=%d)\n" msgid "windows32_openpipe (): process_init_fd() failed\n" msgstr "windows32_openpipe (): памылка ў process_init_fd()\n" -#: function.c:1727 +#: function.c:1725 #, c-format msgid "Cleaning up temporary batch file %s\n" msgstr "" -#: function.c:2105 +#: function.c:2101 #, c-format msgid "insufficient number of arguments (%d) to function `%s'" msgstr "" -#: function.c:2117 +#: function.c:2113 #, fuzzy, c-format msgid "unimplemented on this platform: function `%s'" msgstr "Ня зроблена для гэтае плятформы: функцыя \"%s\"" -#: function.c:2167 +#: function.c:2163 #, c-format msgid "unterminated call to function `%s': missing `%c'" msgstr "" @@ -498,32 +498,32 @@ msgstr "" msgid "Trying pattern rule with stem `%.*s'.\n" msgstr "" -#: implicit.c:658 +#: implicit.c:667 #, c-format msgid "Rejecting impossible implicit prerequisite `%s'.\n" msgstr "" -#: implicit.c:659 +#: implicit.c:668 #, c-format msgid "Rejecting impossible rule prerequisite `%s'.\n" msgstr "" -#: implicit.c:669 +#: implicit.c:678 #, c-format msgid "Trying implicit prerequisite `%s'.\n" msgstr "" -#: implicit.c:670 +#: implicit.c:679 #, c-format msgid "Trying rule prerequisite `%s'.\n" msgstr "" -#: implicit.c:701 +#: implicit.c:710 #, c-format msgid "Found prerequisite `%s' as VPATH `%s'\n" msgstr "" -#: implicit.c:721 +#: implicit.c:730 #, c-format msgid "Looking for a rule with intermediate file `%s'.\n" msgstr "" diff --git a/po/da.gmo b/po/da.gmo index a1aff14418be48a8591134df5410c1b5a4f052c3..1c357cc186857f543ae3c7f3b20db4e2f115499c 100644 GIT binary patch delta 25 gcmaFg#`M08X+xYpmx-={p@M;-m5IUT41abL0C!3U+yDRo delta 25 gcmaFg#`M08X+xYpm$9y)rGk->m4W%@41abL0C&>|>Hq)$ diff --git a/po/da.po b/po/da.po index d6917b49..1a14e30e 100644 --- a/po/da.po +++ b/po/da.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: make 3.80\n" "Report-Msgid-Bugs-To: bug-make@gnu.org\n" -"POT-Creation-Date: 2006-03-19 22:07-0500\n" +"POT-Creation-Date: 2006-04-01 01:40-0500\n" "PO-Revision-Date: 2002-10-05 22:56+0200\n" "Last-Translator: Byrial Ole Jensen \n" "Language-Team: Danish \n" @@ -387,22 +387,22 @@ msgstr "CreatePipe() mislykkedes (e=%d)\n" msgid "windows32_openpipe (): process_init_fd() failed\n" msgstr "windows32_openpipe(): process_init_fd() mislykkedes\n" -#: function.c:1727 +#: function.c:1725 #, c-format msgid "Cleaning up temporary batch file %s\n" msgstr "Afrydder midlertidig batchfil %s\n" -#: function.c:2105 +#: function.c:2101 #, fuzzy, c-format msgid "insufficient number of arguments (%d) to function `%s'" msgstr "Utilstrkkeligt antal argumenter (%d) til funktionen '%s'" -#: function.c:2117 +#: function.c:2113 #, fuzzy, c-format msgid "unimplemented on this platform: function `%s'" msgstr "Uimplementeret p denne platform: funktion '%s'" -#: function.c:2167 +#: function.c:2163 #, c-format msgid "unterminated call to function `%s': missing `%c'" msgstr "Uafsluttet kald til funktionen '%s'; manglende '%c'" @@ -501,32 +501,32 @@ msgstr "Undg msgid "Trying pattern rule with stem `%.*s'.\n" msgstr "Prver mnsterregel med stammen '%.*s'.\n" -#: implicit.c:658 +#: implicit.c:667 #, c-format msgid "Rejecting impossible implicit prerequisite `%s'.\n" msgstr "Afviser umulig implicit forudstning '%s'.\n" -#: implicit.c:659 +#: implicit.c:668 #, c-format msgid "Rejecting impossible rule prerequisite `%s'.\n" msgstr "Afviser umulig regelforudstning '%s'.\n" -#: implicit.c:669 +#: implicit.c:678 #, c-format msgid "Trying implicit prerequisite `%s'.\n" msgstr "Prver implicit forudstning '%s'.\n" -#: implicit.c:670 +#: implicit.c:679 #, c-format msgid "Trying rule prerequisite `%s'.\n" msgstr "Prver regelforudstning '%s'.\n" -#: implicit.c:701 +#: implicit.c:710 #, c-format msgid "Found prerequisite `%s' as VPATH `%s'\n" msgstr "Fandt forudstning '%s' som VPATH '%s'\n" -#: implicit.c:721 +#: implicit.c:730 #, c-format msgid "Looking for a rule with intermediate file `%s'.\n" msgstr "Kigger efter en regel med mellemfil '%s'.\n" diff --git a/po/de.gmo b/po/de.gmo index a12185d927613630b3ca0a984717b52ca75f6a29..98b9f9b4c0a5de655fd305ee622e88787111a709 100644 GIT binary patch delta 25 hcmdn=nsL)>#tn;|xJ+~n3>6FvtxOCyuXSQI1^|MR2$ui= delta 25 hcmdn=nsL)>#tn;|xQulTEftK6tPIRIuXSQI1^|N_2&Di3 diff --git a/po/de.po b/po/de.po index fcb6f073..41acd952 100644 --- a/po/de.po +++ b/po/de.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: make 3.81-b3\n" "Report-Msgid-Bugs-To: bug-make@gnu.org\n" -"POT-Creation-Date: 2006-03-19 22:07-0500\n" +"POT-Creation-Date: 2006-04-01 01:40-0500\n" "PO-Revision-Date: 2005-10-20 20:55+0200\n" "Last-Translator: Karl Eichwalder \n" "Language-Team: German \n" @@ -419,22 +419,22 @@ msgstr " msgid "windows32_openpipe (): process_init_fd() failed\n" msgstr "windows32_openpipe (): process_init_fd() schlug fehl\n" -#: function.c:1727 +#: function.c:1725 #, c-format msgid "Cleaning up temporary batch file %s\n" msgstr "Lsche temporre Stapelverarbeitungsdatei %s\n" -#: function.c:2105 +#: function.c:2101 #, fuzzy, c-format msgid "insufficient number of arguments (%d) to function `%s'" msgstr "Zuwenig Argumente (%d) fr die Funktion %s" -#: function.c:2117 +#: function.c:2113 #, fuzzy, c-format msgid "unimplemented on this platform: function `%s'" msgstr "Auf dieser Rechnerkonfiguration nicht implementiert: Funktion %s" -#: function.c:2167 +#: function.c:2163 #, c-format msgid "unterminated call to function `%s': missing `%c'" msgstr "Nicht beendeter Aufruf der Funktion %s: %c fehlt" @@ -533,32 +533,32 @@ msgstr "Vermeide Rekursion in den impliziten Regeln.\n" msgid "Trying pattern rule with stem `%.*s'.\n" msgstr "Versuche Muster-Regel mit Ersetzung %.*s.\n" -#: implicit.c:658 +#: implicit.c:667 #, c-format msgid "Rejecting impossible implicit prerequisite `%s'.\n" msgstr "Unmgliche implizite Voraussetzung %s abgelehnt.\n" -#: implicit.c:659 +#: implicit.c:668 #, c-format msgid "Rejecting impossible rule prerequisite `%s'.\n" msgstr "Unmgliche Voraussetzung %s abgelehnt.\n" -#: implicit.c:669 +#: implicit.c:678 #, c-format msgid "Trying implicit prerequisite `%s'.\n" msgstr "Versuche implizite Voraussetzung %s.\n" -#: implicit.c:670 +#: implicit.c:679 #, c-format msgid "Trying rule prerequisite `%s'.\n" msgstr "Versuche Voraussetzung %s.\n" -#: implicit.c:701 +#: implicit.c:710 #, c-format msgid "Found prerequisite `%s' as VPATH `%s'\n" msgstr "Fand die Voraussetzung %s als VPATH %s\n" -#: implicit.c:721 +#: implicit.c:730 #, c-format msgid "Looking for a rule with intermediate file `%s'.\n" msgstr "Suche nach einer Regel mit der Zwischendatei %s.\n" diff --git a/po/es.gmo b/po/es.gmo index a530d4ce0bbb38e193780972d7fec32c78f5aca8..9d9cc07997ae489496f86736a0a1a24d72b7935e 100644 GIT binary patch delta 25 gcmeC$z|^&YX#-0rmx-={p@M;-m5IS-zR*8T0A|$(!2kdN delta 25 gcmeC$z|^&YX#-0rm$9y)rGk->m4W$YzR*8T0B2qY&j0`b diff --git a/po/es.po b/po/es.po index ccea76b5..73fffd47 100644 --- a/po/es.po +++ b/po/es.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: GNU make 3.81-b3\n" "Report-Msgid-Bugs-To: bug-make@gnu.org\n" -"POT-Creation-Date: 2006-03-19 22:07-0500\n" +"POT-Creation-Date: 2006-04-01 01:40-0500\n" "PO-Revision-Date: 2005-06-28 19:59-0500\n" "Last-Translator: Max de Mendizbal \n" "Language-Team: Spanish \n" @@ -497,22 +497,22 @@ msgstr "Fallo en CreatePipe(), (e=%d)\n" msgid "windows32_openpipe (): process_init_fd() failed\n" msgstr "windows32_openpipe (): fallo en process_init_fd()\n" -#: function.c:1727 +#: function.c:1725 #, c-format msgid "Cleaning up temporary batch file %s\n" msgstr "Limpiando el archivo temporal %s\n" -#: function.c:2105 +#: function.c:2101 #, fuzzy, c-format msgid "insufficient number of arguments (%d) to function `%s'" msgstr "Nmero de argumentos (%d) insuficientes para la funcin `%s'" -#: function.c:2117 +#: function.c:2113 #, fuzzy, c-format msgid "unimplemented on this platform: function `%s'" msgstr "No implementado en esta plataforma: funcin `%s'" -#: function.c:2167 +#: function.c:2163 #, c-format msgid "unterminated call to function `%s': missing `%c'" msgstr "la llamada a la funcin `%s' no concluy: falta `%c'" @@ -646,7 +646,7 @@ msgstr "Intentando una regla de patr # aparecer tal y como est ahora (Se rechaza la dependencia imposible # `%s' `%s )'em+ # Ok. mm -#: implicit.c:658 +#: implicit.c:667 #, c-format msgid "Rejecting impossible implicit prerequisite `%s'.\n" msgstr "Se rechaza la dependencia imposible `%s'.\n" @@ -658,7 +658,7 @@ msgstr "Se rechaza la dependencia imposible `%s'.\n" # aparecer tal y como est ahora (Se rechaza la dependencia imposible # `%s' `%s )'em+ # Ok. mm -#: implicit.c:659 +#: implicit.c:668 #, c-format msgid "Rejecting impossible rule prerequisite `%s'.\n" msgstr "Se rechaza la regla de dependencia imposible `%s'.\n" @@ -670,7 +670,7 @@ msgstr "Se rechaza la regla de dependencia imposible `%s'.\n" # Me gusta evade, pero evita es correcto. Acepto tu sugerencia. mm # No me gusta se evita, pondra evitando em+ # Ok. Pero a mi paranoia de evitar gerundios dnde la dejas? mm -#: implicit.c:669 +#: implicit.c:678 #, c-format msgid "Trying implicit prerequisite `%s'.\n" msgstr "Probando la dependencia implcita `%s'.\n" @@ -683,17 +683,17 @@ msgstr "Probando la dependencia impl # De momento cambio la regla patron por una regla de patron , y # pondra a toda costa gerundio ( intentando ) em+ # Ok con el gerundio. Pero tambin tengo que meditarlo. mm -#: implicit.c:670 +#: implicit.c:679 #, c-format msgid "Trying rule prerequisite `%s'.\n" msgstr "Intentando la regla de dependencia `%s'.\n" -#: implicit.c:701 +#: implicit.c:710 #, c-format msgid "Found prerequisite `%s' as VPATH `%s'\n" msgstr "Se encontr la dependencia `%s' como la VPATH `%s'.\n" -#: implicit.c:721 +#: implicit.c:730 #, c-format msgid "Looking for a rule with intermediate file `%s'.\n" msgstr "Se busca una regla con el archivo intermedio `%s'.\n" diff --git a/po/fi.gmo b/po/fi.gmo index 07c50b2ba86b2c02465b9d4ddfc55c07f9354f28..fa05218bdb03c8505c91927ec7cb0ea33828f636 100644 GIT binary patch delta 25 hcmZ29i)qm;rVY~rxJ+~n3>6FvtxOCyFAQk30RVEL2w(sJ delta 25 hcmZ29i)qm;rVY~rxQulTEftK6tPIRIFAQk30RVF<2yOrX diff --git a/po/fi.po b/po/fi.po index a39ffc49..d17bf962 100644 --- a/po/fi.po +++ b/po/fi.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: make 3.81-b3\n" "Report-Msgid-Bugs-To: bug-make@gnu.org\n" -"POT-Creation-Date: 2006-03-19 22:07-0500\n" +"POT-Creation-Date: 2006-04-01 01:40-0500\n" "PO-Revision-Date: 2005-07-06 21:36+0300\n" "Last-Translator: Lauri Nurmi \n" "Language-Team: Finnish \n" @@ -390,22 +390,22 @@ msgstr "CreatePipe() epäonnistui (v=%d)\n" msgid "windows32_openpipe (): process_init_fd() failed\n" msgstr "windows32_openpipe (): process_init_fd() epäonnistui\n" -#: function.c:1727 +#: function.c:1725 #, c-format msgid "Cleaning up temporary batch file %s\n" msgstr "Siivotaan väliaikainen komentotiedosto %s\n" -#: function.c:2105 +#: function.c:2101 #, fuzzy, c-format msgid "insufficient number of arguments (%d) to function `%s'" msgstr "Liian vähän (%d) argumenttejeja funktiolle \"%s\"" -#: function.c:2117 +#: function.c:2113 #, fuzzy, c-format msgid "unimplemented on this platform: function `%s'" msgstr "Ei toteutettu tällä alustalla: funktio \"%s\"" -#: function.c:2167 +#: function.c:2163 #, c-format msgid "unterminated call to function `%s': missing `%c'" msgstr "päättämätön kutsu funktioon \"%s\": puuttuva \"%c\"" @@ -504,32 +504,32 @@ msgstr "Vältetään oletussääntörekursio.\n" msgid "Trying pattern rule with stem `%.*s'.\n" msgstr "Kokeillaan hahmosääntöä rungolla \"%.*s\".\n" -#: implicit.c:658 +#: implicit.c:667 #, c-format msgid "Rejecting impossible implicit prerequisite `%s'.\n" msgstr "Hylätään mahdoton oletusennakkoehto \"%s\".\n" -#: implicit.c:659 +#: implicit.c:668 #, c-format msgid "Rejecting impossible rule prerequisite `%s'.\n" msgstr "Hylätään mahdoton säännön ennakkoehto \"%s\".\n" -#: implicit.c:669 +#: implicit.c:678 #, c-format msgid "Trying implicit prerequisite `%s'.\n" msgstr "Yritetään käyttää oletusennakkoehtoa \"%s\".\n" -#: implicit.c:670 +#: implicit.c:679 #, c-format msgid "Trying rule prerequisite `%s'.\n" msgstr "Yritetään käyttää säännön ennakkoehtoa \"%s\".\n" -#: implicit.c:701 +#: implicit.c:710 #, c-format msgid "Found prerequisite `%s' as VPATH `%s'\n" msgstr "Löydettiin ennakkoehto \"%s\", joka on VPATH \"%s\"\n" -#: implicit.c:721 +#: implicit.c:730 #, c-format msgid "Looking for a rule with intermediate file `%s'.\n" msgstr "Etsitään sääntöä aputiedostolla \"%s\".\n" diff --git a/po/fr.gmo b/po/fr.gmo index e6d789b273836810b1a3510e01bf35baa1956dd0..b86a249e4a86289af640ec6c7271b8e3752806fc 100644 GIT binary patch delta 25 gcmcb!j_J-irVT8iTqe2(h6)CTRwf3U`9l4i0CX(}vj6}9 delta 25 gcmcb!j_J-irVT8iT*kVFmI_8jRtDyq`9l4i0Ccto!2kdN diff --git a/po/fr.po b/po/fr.po index 6b4b35cd..b6e1db3a 100644 --- a/po/fr.po +++ b/po/fr.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: GNU make 3.81-b3\n" "Report-Msgid-Bugs-To: bug-make@gnu.org\n" -"POT-Creation-Date: 2006-03-19 22:07-0500\n" +"POT-Creation-Date: 2006-04-01 01:40-0500\n" "PO-Revision-Date: 2005-06-29 08:00-0500\n" "Last-Translator: Michel Robitaille \n" "Language-Team: French \n" @@ -399,22 +399,22 @@ msgstr "CreatePipe() en msgid "windows32_openpipe (): process_init_fd() failed\n" msgstr "windows32_openpipe(): process_init_fd() en chec\n" -#: function.c:1727 +#: function.c:1725 #, c-format msgid "Cleaning up temporary batch file %s\n" msgstr "Nettoyage du fichier temporaire %s\n" -#: function.c:2105 +#: function.c:2101 #, fuzzy, c-format msgid "insufficient number of arguments (%d) to function `%s'" msgstr "nombre insuffisant d'argument (%d) de la fonction %s " -#: function.c:2117 +#: function.c:2113 #, fuzzy, c-format msgid "unimplemented on this platform: function `%s'" msgstr "Non implant sur cette plate-forme: fonction %s " -#: function.c:2167 +#: function.c:2163 #, c-format msgid "unterminated call to function `%s': missing `%c'" msgstr "appel la fonction %s non termin : %c manquant" @@ -513,32 +513,32 @@ msgstr " msgid "Trying pattern rule with stem `%.*s'.\n" msgstr "Essai du schma avec %.*s comme prfixe.\n" -#: implicit.c:658 +#: implicit.c:667 #, c-format msgid "Rejecting impossible implicit prerequisite `%s'.\n" msgstr "Rejet impossible d'une dpendance implicite %s .\n" -#: implicit.c:659 +#: implicit.c:668 #, c-format msgid "Rejecting impossible rule prerequisite `%s'.\n" msgstr "Rejet impossible d'une dpendance de rgle %s .\n" -#: implicit.c:669 +#: implicit.c:678 #, c-format msgid "Trying implicit prerequisite `%s'.\n" msgstr "Essaie de la dpendance implicite %s .\n" -#: implicit.c:670 +#: implicit.c:679 #, c-format msgid "Trying rule prerequisite `%s'.\n" msgstr "Essai de la rgle de dpendance %s .\n" -#: implicit.c:701 +#: implicit.c:710 #, c-format msgid "Found prerequisite `%s' as VPATH `%s'\n" msgstr "Dpendance trouve %s comme VPATH %s \n" -#: implicit.c:721 +#: implicit.c:730 #, c-format msgid "Looking for a rule with intermediate file `%s'.\n" msgstr "Recherche d'une rgle contenant le fichier intermdaire %s .\n" diff --git a/po/ga.gmo b/po/ga.gmo index 2cb7c5936f757b0eeb645267290881e23d57cd18..bdfd99d34a5c8fbf51e4e7bc1d8b63a858dfe586 100644 GIT binary patch delta 24 fcmeyog6Z=LrUju~Cb|ZO3I>K&CI*|iLNo0FawrGY delta 24 fcmeyog6Z=LrUju~#=3@<3Pwg&2IiZ&LNo0FaF diff --git a/po/ga.po b/po/ga.po index 300e0821..be851468 100644 --- a/po/ga.po +++ b/po/ga.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: make 3.81-b3\n" "Report-Msgid-Bugs-To: bug-make@gnu.org\n" -"POT-Creation-Date: 2006-03-19 22:07-0500\n" +"POT-Creation-Date: 2006-04-01 01:40-0500\n" "PO-Revision-Date: 2005-06-28 10:16-0500\n" "Last-Translator: Kevin Patrick Scannell \n" "Language-Team: Irish \n" @@ -395,22 +395,22 @@ msgstr "Theip ar CreatePipe() (e=%d)\n" msgid "windows32_openpipe (): process_init_fd() failed\n" msgstr "windows32_openpipe (): theip ar process_init_fd()\n" -#: function.c:1727 +#: function.c:1725 #, c-format msgid "Cleaning up temporary batch file %s\n" msgstr "Baisc-chomhad sealadach %s ghlanadh\n" -#: function.c:2105 +#: function.c:2101 #, fuzzy, c-format msgid "insufficient number of arguments (%d) to function `%s'" msgstr "Easpa argint (%d) d'fheidhm `%s'" -#: function.c:2117 +#: function.c:2113 #, fuzzy, c-format msgid "unimplemented on this platform: function `%s'" msgstr "Nl an fheidhm `%s' ar fil ar an chras seo" -#: function.c:2167 +#: function.c:2163 #, c-format msgid "unterminated call to function `%s': missing `%c'" msgstr "glao ar fheidhm `%s' gan chrochn: `%c' ar iarraidh" @@ -510,32 +510,32 @@ msgstr "Athch msgid "Trying pattern rule with stem `%.*s'.\n" msgstr "Ag baint triail as riail phatrin le stoc `%.*s'.\n" -#: implicit.c:658 +#: implicit.c:667 #, c-format msgid "Rejecting impossible implicit prerequisite `%s'.\n" msgstr "Ramhriachtanas intuigthe neamhfhideartha `%s' dhilt.\n" -#: implicit.c:659 +#: implicit.c:668 #, c-format msgid "Rejecting impossible rule prerequisite `%s'.\n" msgstr "Ramhriachtanas neamhfhideartha rialach `%s' dhilt.\n" -#: implicit.c:669 +#: implicit.c:678 #, c-format msgid "Trying implicit prerequisite `%s'.\n" msgstr "Ag baint triail as an ramhriachtanas intuigthe `%s'.\n" -#: implicit.c:670 +#: implicit.c:679 #, c-format msgid "Trying rule prerequisite `%s'.\n" msgstr "Ag baint triail as an ramhriachtanas rialach `%s'.\n" -#: implicit.c:701 +#: implicit.c:710 #, c-format msgid "Found prerequisite `%s' as VPATH `%s'\n" msgstr "Aimsodh ramhriachtanas `%s' mar VPATH `%s'\n" -#: implicit.c:721 +#: implicit.c:730 #, c-format msgid "Looking for a rule with intermediate file `%s'.\n" msgstr "Ag danamh cuardach ar riail le comhad idirmhenach `%s'.\n" diff --git a/po/gl.gmo b/po/gl.gmo index c18dc166ee1956e64c2d220476d3683a5ebbf10a..f0feca0de7e7e19e8520579be7234f817e0c1aea 100644 GIT binary patch delta 25 gcmZpk#?(BGX+xYpmx-={p@M;-m5IUT4FB2I0B3avzW@LL delta 25 gcmZpk#?(BGX+xYpm$9y)rGk->m4W%@4FB2I0B8OO%>V!Z diff --git a/po/gl.po b/po/gl.po index 3f3d313e..c59a6d78 100644 --- a/po/gl.po +++ b/po/gl.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: make 3.80\n" "Report-Msgid-Bugs-To: bug-make@gnu.org\n" -"POT-Creation-Date: 2006-03-19 22:07-0500\n" +"POT-Creation-Date: 2006-04-01 01:40-0500\n" "PO-Revision-Date: 2002-10-05 14:46+0200\n" "Last-Translator: Jacobo Tarrio \n" "Language-Team: Galician \n" @@ -390,22 +390,22 @@ msgstr "A chamada a CreatePipe() fallou (e=%d)\n" msgid "windows32_openpipe (): process_init_fd() failed\n" msgstr "windows32_openpipe (): a chamada a process_init_fd() fallou\n" -#: function.c:1727 +#: function.c:1725 #, c-format msgid "Cleaning up temporary batch file %s\n" msgstr "Limpando o ficheiro de lotes temporal %s\n" -#: function.c:2105 +#: function.c:2101 #, fuzzy, c-format msgid "insufficient number of arguments (%d) to function `%s'" msgstr "Nmero de argumentos insuficiente (%d) na chamada funcin `%s'" -#: function.c:2117 +#: function.c:2113 #, fuzzy, c-format msgid "unimplemented on this platform: function `%s'" msgstr "Non implementada nesta plataforma: funcin `%s'" -#: function.c:2167 +#: function.c:2163 #, c-format msgid "unterminated call to function `%s': missing `%c'" msgstr "chamada funcin `%s' non rematada: falla `%c'" @@ -504,32 +504,32 @@ msgstr "Evitando a recursi msgid "Trying pattern rule with stem `%.*s'.\n" msgstr "Probando a regra de patrn con raiz `%.*s'.\n" -#: implicit.c:658 +#: implicit.c:667 #, c-format msgid "Rejecting impossible implicit prerequisite `%s'.\n" msgstr "Rexeitando o prerrequisito implcito imposible `%s'.\n" -#: implicit.c:659 +#: implicit.c:668 #, c-format msgid "Rejecting impossible rule prerequisite `%s'.\n" msgstr "Rexeitando o prerrequisito imposible `%s'.\n" -#: implicit.c:669 +#: implicit.c:678 #, c-format msgid "Trying implicit prerequisite `%s'.\n" msgstr "Probando o prerrequisito implcito `%s'.\n" -#: implicit.c:670 +#: implicit.c:679 #, c-format msgid "Trying rule prerequisite `%s'.\n" msgstr "Probando o prerrequisito `%s'.\n" -#: implicit.c:701 +#: implicit.c:710 #, c-format msgid "Found prerequisite `%s' as VPATH `%s'\n" msgstr "Atopouse a o prerrequisito `%s' coma VPATH `%s'\n" -#: implicit.c:721 +#: implicit.c:730 #, c-format msgid "Looking for a rule with intermediate file `%s'.\n" msgstr "Buscando unha regra co ficheiro intermedio `%s'.\n" diff --git a/po/he.gmo b/po/he.gmo index fb0e3c9169bd1c24e041ff25dffc4418989ce1e5..50797d1c60332f45e79a6b0917305785c037690b 100644 GIT binary patch delta 25 gcmZoY$k=+2aYKwPmx-={p@M;-m5IUTG+TLP0Bn;7TL1t6 delta 25 gcmZoY$k=+2aYKwPm$9y)rGk->m4W%@G+TLP0BsxxX#fBK diff --git a/po/he.po b/po/he.po index 25314b56..2880ccb3 100644 --- a/po/he.po +++ b/po/he.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: make 3.79.1\n" "Report-Msgid-Bugs-To: bug-make@gnu.org\n" -"POT-Creation-Date: 2006-03-19 22:07-0500\n" +"POT-Creation-Date: 2006-04-01 01:40-0500\n" "PO-Revision-Date: 2002-03-30 21:33+0300\n" "Last-Translator: Eli Zaretskii \n" "Language-Team: Hebrew \n" @@ -390,22 +390,22 @@ msgstr "CreatePipe() failed (e=%d)\n" msgid "windows32_openpipe (): process_init_fd() failed\n" msgstr "windows32_openpipe (): process_init_fd() failed\n" -#: function.c:1727 +#: function.c:1725 #, c-format msgid "Cleaning up temporary batch file %s\n" msgstr "`%s' batch \n" -#: function.c:2105 +#: function.c:2101 #, fuzzy, c-format msgid "insufficient number of arguments (%d) to function `%s'" msgstr " (%d) `%s' " -#: function.c:2117 +#: function.c:2113 #, fuzzy, c-format msgid "unimplemented on this platform: function `%s'" msgstr " `%s' " -#: function.c:2167 +#: function.c:2163 #, c-format msgid "unterminated call to function `%s': missing `%c'" msgstr "`%s' `%c' " @@ -504,32 +504,32 @@ msgstr ". msgid "Trying pattern rule with stem `%.*s'.\n" msgstr ".`%.*s' \n" -#: implicit.c:658 +#: implicit.c:667 #, c-format msgid "Rejecting impossible implicit prerequisite `%s'.\n" msgstr ".- `%s' - \n" -#: implicit.c:659 +#: implicit.c:668 #, c-format msgid "Rejecting impossible rule prerequisite `%s'.\n" msgstr ".- `%s' \n" -#: implicit.c:669 +#: implicit.c:678 #, c-format msgid "Trying implicit prerequisite `%s'.\n" msgstr ".`%s' - \n" -#: implicit.c:670 +#: implicit.c:679 #, c-format msgid "Trying rule prerequisite `%s'.\n" msgstr ".`%s' \n" -#: implicit.c:701 +#: implicit.c:710 #, c-format msgid "Found prerequisite `%s' as VPATH `%s'\n" msgstr "`%s' VPATH `%s' \n" -#: implicit.c:721 +#: implicit.c:730 #, c-format msgid "Looking for a rule with intermediate file `%s'.\n" msgstr ".`%s' \n" diff --git a/po/hr.gmo b/po/hr.gmo index fed67547caa9cd71f92c7040aeeea2fc8018b3bd..c4b3e8e505a8aec1b26140b9b4678dd1005cd2b7 100644 GIT binary patch delta 25 gcmbQ&%`~r@X+xYpmx-={p@M;-m5IUT41Y5-0BNiTbpQYW delta 25 gcmbQ&%`~r@X+xYpm$9y)rGk->m4W%@41Y5-0BSV{g8%>k diff --git a/po/hr.po b/po/hr.po index af7d63bc..20197550 100644 --- a/po/hr.po +++ b/po/hr.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: make 3.80\n" "Report-Msgid-Bugs-To: bug-make@gnu.org\n" -"POT-Creation-Date: 2006-03-19 22:07-0500\n" +"POT-Creation-Date: 2006-04-01 01:40-0500\n" "PO-Revision-Date: 2003-10-12 18:01+0200\n" "Last-Translator: Hrvoje Niksic \n" "Language-Team: Croatian \n" @@ -387,22 +387,22 @@ msgstr "CreatePipe() je zakazao (e=%d)\n" msgid "windows32_openpipe (): process_init_fd() failed\n" msgstr "windows32_openpipe (): process_init_fd() je zakazao\n" -#: function.c:1727 +#: function.c:1725 #, c-format msgid "Cleaning up temporary batch file %s\n" msgstr "istim privremeni batch spis %s.\n" -#: function.c:2105 +#: function.c:2101 #, fuzzy, c-format msgid "insufficient number of arguments (%d) to function `%s'" msgstr "Nedovoljan broj argumenata (%d) funkciji `%s'" -#: function.c:2117 +#: function.c:2113 #, fuzzy, c-format msgid "unimplemented on this platform: function `%s'" msgstr "Neimplementirano na ovoj platformi: funkcija `%s'" -#: function.c:2167 +#: function.c:2163 #, c-format msgid "unterminated call to function `%s': missing `%c'" msgstr "nedovren poziv funkciji `%s': nedostaje `%c'" @@ -501,32 +501,32 @@ msgstr "Izbjegavam rekurziju implicitnog propisa.\n" msgid "Trying pattern rule with stem `%.*s'.\n" msgstr "Pokuavam propis uzorka s korijenom `%.*s'.\n" -#: implicit.c:658 +#: implicit.c:667 #, c-format msgid "Rejecting impossible implicit prerequisite `%s'.\n" msgstr "Odbacujem nemogu prerekvizit `%s'.\n" -#: implicit.c:659 +#: implicit.c:668 #, c-format msgid "Rejecting impossible rule prerequisite `%s'.\n" msgstr "Odbacujem nemogue pravilo prerekvizita `%s'.\n" -#: implicit.c:669 +#: implicit.c:678 #, c-format msgid "Trying implicit prerequisite `%s'.\n" msgstr "Pokuavam s implicitnim prerekvizitom `%s'.\n" -#: implicit.c:670 +#: implicit.c:679 #, c-format msgid "Trying rule prerequisite `%s'.\n" msgstr "Pokuavam s propisom prerekvizita `%s'.\n" -#: implicit.c:701 +#: implicit.c:710 #, c-format msgid "Found prerequisite `%s' as VPATH `%s'\n" msgstr "Naao prerekvizit `%s' kao VPATH `%s'\n" -#: implicit.c:721 +#: implicit.c:730 #, c-format msgid "Looking for a rule with intermediate file `%s'.\n" msgstr "Traim propis s posrednim spisom `%s'.\n" diff --git a/po/id.gmo b/po/id.gmo index 7a0efbd3852ed660997cb410e4e3b9e2bd949359..ce46634b8e30e98d0bfd9fbf16d3f56e7d2ac27e 100644 GIT binary patch delta 25 hcmX?fhVjrD#tqYLxJ+~n3>6FvtxOCyFSJ>x2>^e+2x2>^gb2=xE} diff --git a/po/id.po b/po/id.po index 00bcae30..6336e437 100644 --- a/po/id.po +++ b/po/id.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: GNU make 3.79\n" "Report-Msgid-Bugs-To: bug-make@gnu.org\n" -"POT-Creation-Date: 2006-03-19 22:07-0500\n" +"POT-Creation-Date: 2006-04-01 01:40-0500\n" "PO-Revision-Date: 2005-07-17 22:00+0700\n" "Last-Translator: Arif E. Nugroho \n" "Language-Team: Indonesian \n" @@ -389,22 +389,22 @@ msgstr "CreatePipe() gagal (e=%d)\n" msgid "windows32_openpipe (): process_init_fd() failed\n" msgstr "windows32_openpipe (): process_init_fd() gagal\n" -#: function.c:1727 +#: function.c:1725 #, c-format msgid "Cleaning up temporary batch file %s\n" msgstr "Membersihkan file batch sementara %s\n" -#: function.c:2105 +#: function.c:2101 #, fuzzy, c-format msgid "insufficient number of arguments (%d) to function `%s'" msgstr "Argumen kurang (%d) untuk fungsi `%s'" -#: function.c:2117 +#: function.c:2113 #, fuzzy, c-format msgid "unimplemented on this platform: function `%s'" msgstr "Tidak terimplementasi dalam platform ini: fungsi `%s'" -#: function.c:2167 +#: function.c:2163 #, c-format msgid "unterminated call to function `%s': missing `%c'" msgstr "fungsi `%s' tidak diselesaikan: hilang `%c'" @@ -503,32 +503,32 @@ msgstr "Menghindari aturan implisit rekursi.\n" msgid "Trying pattern rule with stem `%.*s'.\n" msgstr "Mencoba aturan pola dengan stem `%.*s'.\n" -#: implicit.c:658 +#: implicit.c:667 #, c-format msgid "Rejecting impossible implicit prerequisite `%s'.\n" msgstr "Menolak persyaratan implisit yang tidak mungkin `%s'.\n" -#: implicit.c:659 +#: implicit.c:668 #, c-format msgid "Rejecting impossible rule prerequisite `%s'.\n" msgstr "Menolak persyaratan aturan yang tidak mungkin `%s'.\n" -#: implicit.c:669 +#: implicit.c:678 #, c-format msgid "Trying implicit prerequisite `%s'.\n" msgstr "Mencoba persyaratan implisit `%s'.\n" -#: implicit.c:670 +#: implicit.c:679 #, c-format msgid "Trying rule prerequisite `%s'.\n" msgstr "Mencoba persyaratan dari aturan `%s'.\n" -#: implicit.c:701 +#: implicit.c:710 #, c-format msgid "Found prerequisite `%s' as VPATH `%s'\n" msgstr "Menemukan persyaratan `%s' sebagai VPATH `%s'\n" -#: implicit.c:721 +#: implicit.c:730 #, c-format msgid "Looking for a rule with intermediate file `%s'.\n" msgstr "Mencari aturan dengan file antara `%s'.\n" diff --git a/po/ja.gmo b/po/ja.gmo index d94242e09a46e72e9c3cfd76ca5120c8d220b34c..d344be2c0f82f099a9fdc7de9f6b19584472704b 100644 GIT binary patch delta 25 gcmey_&GfUIX+xYpmx-={p@M;-m5IUT4F8E{0DBh*h5!Hn delta 25 gcmey_&GfUIX+xYpm$9y)rGk->m4W%@4F8E{0DGValmGw# diff --git a/po/ja.po b/po/ja.po index 740d718b..bae08895 100644 --- a/po/ja.po +++ b/po/ja.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: make 3.80\n" "Report-Msgid-Bugs-To: bug-make@gnu.org\n" -"POT-Creation-Date: 2006-03-19 22:07-0500\n" +"POT-Creation-Date: 2006-04-01 01:40-0500\n" "PO-Revision-Date: 2004-05-18 00:47+0900\n" "Last-Translator: GOTO Masanori \n" "Language-Team: Japanese \n" @@ -389,22 +389,22 @@ msgstr "CreatePipe() msgid "windows32_openpipe (): process_init_fd() failed\n" msgstr "windows32_openpipe (): process_init_fd() \n" -#: function.c:1727 +#: function.c:1725 #, c-format msgid "Cleaning up temporary batch file %s\n" msgstr "ŪʥХåե %s õޤ\n" -#: function.c:2105 +#: function.c:2101 #, fuzzy, c-format msgid "insufficient number of arguments (%d) to function `%s'" msgstr "ο(%d)ؿ `%s' ˤȤäԽʬǤ" -#: function.c:2117 +#: function.c:2113 #, fuzzy, c-format msgid "unimplemented on this platform: function `%s'" msgstr "ΥץåȥեǤϼƤޤ: ؿ `%s'" -#: function.c:2167 +#: function.c:2163 #, c-format msgid "unterminated call to function `%s': missing `%c'" msgstr "üʤؿƤӽФ `%s': `%c' ޤ" @@ -505,32 +505,32 @@ msgstr " msgid "Trying pattern rule with stem `%.*s'.\n" msgstr "촴 `%.*s' ȤΥѥ롼ޤ.\n" -#: implicit.c:658 +#: implicit.c:667 #, c-format msgid "Rejecting impossible implicit prerequisite `%s'.\n" msgstr "Ŭǽʰۤɬ׾ `%s' Ѳޤ.\n" -#: implicit.c:659 +#: implicit.c:668 #, c-format msgid "Rejecting impossible rule prerequisite `%s'.\n" msgstr "Ŭǽʥ롼ɬ׾ `%s' Ѳޤ.\n" -#: implicit.c:669 +#: implicit.c:678 #, c-format msgid "Trying implicit prerequisite `%s'.\n" msgstr "ۤɬ׾ `%s' ޤ.\n" -#: implicit.c:670 +#: implicit.c:679 #, c-format msgid "Trying rule prerequisite `%s'.\n" msgstr "롼ɬ׾ `%s' ޤ.\n" -#: implicit.c:701 +#: implicit.c:710 #, c-format msgid "Found prerequisite `%s' as VPATH `%s'\n" msgstr "VPATH `%2$s' Ȥɬ׾ `%1$s' 򸫤Ĥޤ\n" -#: implicit.c:721 +#: implicit.c:730 #, c-format msgid "Looking for a rule with intermediate file `%s'.\n" msgstr "֥ե `%s' Υ롼õޤ.\n" diff --git a/po/ko.gmo b/po/ko.gmo index 4c91210fd851ba32ae5160fb5acfa413458aef68..e33e02b3d27ea5e40987afc71f4dd516dc4b488c 100644 GIT binary patch delta 25 gcmX?eobk+Y#tjL!Tqe2(h6)CTRwf3Uvuu;p0DFrFLjV8( delta 25 gcmX?eobk+Y#tjL!T*kVFmI_8jRtDyqvuu;p0DKe(Q2+n{ diff --git a/po/ko.po b/po/ko.po index ab86a59d..2fa67526 100644 --- a/po/ko.po +++ b/po/ko.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: GNU make 3.79.1\n" "Report-Msgid-Bugs-To: bug-make@gnu.org\n" -"POT-Creation-Date: 2006-03-19 22:07-0500\n" +"POT-Creation-Date: 2006-04-01 01:40-0500\n" "PO-Revision-Date: 2001-06-08 01:30+0900\n" "Last-Translator: Changwoo Ryu \n" "Language-Team: Korean \n" @@ -388,22 +388,22 @@ msgstr "CreatePipe() msgid "windows32_openpipe (): process_init_fd() failed\n" msgstr "windows32_openpipe (): process_init_fd() \n" -#: function.c:1727 +#: function.c:1725 #, c-format msgid "Cleaning up temporary batch file %s\n" msgstr "ӽ ġ %s() ϴ\n" -#: function.c:2105 +#: function.c:2101 #, fuzzy, c-format msgid "insufficient number of arguments (%d) to function `%s'" msgstr "Լ `%2$s' (%1$d) մϴ " -#: function.c:2117 +#: function.c:2113 #, fuzzy, c-format msgid "unimplemented on this platform: function `%s'" msgstr " ÷ ʾҽϴ: `%s' Լ" -#: function.c:2167 +#: function.c:2163 #, c-format msgid "unterminated call to function `%s': missing `%c'" msgstr "Լ `%s' ȣ: `%c' " @@ -504,32 +504,32 @@ msgstr " msgid "Trying pattern rule with stem `%.*s'.\n" msgstr " `%.*s' Ģ õ.\n" -#: implicit.c:658 +#: implicit.c:667 #, c-format msgid "Rejecting impossible implicit prerequisite `%s'.\n" msgstr "Ұ `%s'() źε˴ϴ.\n" -#: implicit.c:659 +#: implicit.c:668 #, c-format msgid "Rejecting impossible rule prerequisite `%s'.\n" msgstr "Ұ Ģ `%s'() źε˴ϴ.\n" -#: implicit.c:669 +#: implicit.c:678 #, c-format msgid "Trying implicit prerequisite `%s'.\n" msgstr " `%s'() õմϴ\n" -#: implicit.c:670 +#: implicit.c:679 #, c-format msgid "Trying rule prerequisite `%s'.\n" msgstr "Ģ `%s'() õմϴ.\n" -#: implicit.c:701 +#: implicit.c:710 #, c-format msgid "Found prerequisite `%s' as VPATH `%s'\n" msgstr "VPATH `%2$s' `%1$s'() ãҽϴ\n" -#: implicit.c:721 +#: implicit.c:730 #, c-format msgid "Looking for a rule with intermediate file `%s'.\n" msgstr "߰ `%s' Ģ ã ֽϴ.\n" diff --git a/po/make.pot b/po/make.pot index db3a5848..7a8083c8 100644 --- a/po/make.pot +++ b/po/make.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: bug-make@gnu.org\n" -"POT-Creation-Date: 2006-03-19 22:07-0500\n" +"POT-Creation-Date: 2006-04-01 01:40-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -381,22 +381,22 @@ msgstr "" msgid "windows32_openpipe (): process_init_fd() failed\n" msgstr "" -#: function.c:1727 +#: function.c:1725 #, c-format msgid "Cleaning up temporary batch file %s\n" msgstr "" -#: function.c:2105 +#: function.c:2101 #, c-format msgid "insufficient number of arguments (%d) to function `%s'" msgstr "" -#: function.c:2117 +#: function.c:2113 #, c-format msgid "unimplemented on this platform: function `%s'" msgstr "" -#: function.c:2167 +#: function.c:2163 #, c-format msgid "unterminated call to function `%s': missing `%c'" msgstr "" @@ -495,32 +495,32 @@ msgstr "" msgid "Trying pattern rule with stem `%.*s'.\n" msgstr "" -#: implicit.c:658 +#: implicit.c:667 #, c-format msgid "Rejecting impossible implicit prerequisite `%s'.\n" msgstr "" -#: implicit.c:659 +#: implicit.c:668 #, c-format msgid "Rejecting impossible rule prerequisite `%s'.\n" msgstr "" -#: implicit.c:669 +#: implicit.c:678 #, c-format msgid "Trying implicit prerequisite `%s'.\n" msgstr "" -#: implicit.c:670 +#: implicit.c:679 #, c-format msgid "Trying rule prerequisite `%s'.\n" msgstr "" -#: implicit.c:701 +#: implicit.c:710 #, c-format msgid "Found prerequisite `%s' as VPATH `%s'\n" msgstr "" -#: implicit.c:721 +#: implicit.c:730 #, c-format msgid "Looking for a rule with intermediate file `%s'.\n" msgstr "" diff --git a/po/nl.gmo b/po/nl.gmo index b9733033122b1a9d3c86b4da1cbc967dc9e0f55b..28adffae2c3e65a7efd5f4c0e8d2629136afb80f 100644 GIT binary patch delta 24 gcmX@TlK&CI*|iLJ!&k0BcPL)c^nh delta 24 gcmX@Tl\n" "Language-Team: Dutch \n" @@ -396,22 +396,22 @@ msgstr "CreatePipe() is mislukt (e=%d)\n" msgid "windows32_openpipe (): process_init_fd() failed\n" msgstr "windows32_openpipe (): process_init_fd() is mislukt\n" -#: function.c:1727 +#: function.c:1725 #, c-format msgid "Cleaning up temporary batch file %s\n" msgstr "Opschonen van tijdelijk batch-bestand %s\n" -#: function.c:2105 +#: function.c:2101 #, fuzzy, c-format msgid "insufficient number of arguments (%d) to function `%s'" msgstr "Onvoldoende aantal argumenten (%d) voor functie '%s'" -#: function.c:2117 +#: function.c:2113 #, fuzzy, c-format msgid "unimplemented on this platform: function `%s'" msgstr "Niet-geïmplementeerd op dit platform: functie '%s'" -#: function.c:2167 +#: function.c:2163 #, c-format msgid "unterminated call to function `%s': missing `%c'" msgstr "onafgemaakte aanroep van functie '%s': '%c' ontbreekt" @@ -510,32 +510,32 @@ msgstr "Impliciete regelrecursie wordt ontweken.\n" msgid "Trying pattern rule with stem `%.*s'.\n" msgstr "Patroonregel wordt geprobeerd met stam '%.*s'.\n" -#: implicit.c:658 +#: implicit.c:667 #, c-format msgid "Rejecting impossible implicit prerequisite `%s'.\n" msgstr "Onmogelijke impliciete vereiste '%s' wordt verworpen.\n" -#: implicit.c:659 +#: implicit.c:668 #, c-format msgid "Rejecting impossible rule prerequisite `%s'.\n" msgstr "Onmogelijke regelvereiste '%s' wordt verworpen.\n" -#: implicit.c:669 +#: implicit.c:678 #, c-format msgid "Trying implicit prerequisite `%s'.\n" msgstr "Proberen van impliciete vereiste '%s'.\n" -#: implicit.c:670 +#: implicit.c:679 #, c-format msgid "Trying rule prerequisite `%s'.\n" msgstr "Proberen van regelvereiste '%s'.\n" -#: implicit.c:701 +#: implicit.c:710 #, c-format msgid "Found prerequisite `%s' as VPATH `%s'\n" msgstr "Vereiste '%s' gevonden als VPATH '%s'.\n" -#: implicit.c:721 +#: implicit.c:730 #, c-format msgid "Looking for a rule with intermediate file `%s'.\n" msgstr "Zoeken naar een regel met tussentijds bestand '%s'.\n" diff --git a/po/pl.gmo b/po/pl.gmo index 7b995e3470dadbd4be2b4d0e46a99a5da930caea..8d87298468f15206fe380cc9903f317740de1765 100644 GIT binary patch delta 24 gcmaF6nCb0erUju~Cb|ZO3I>K&CI*|iLLb`z0C6-3HUIzs delta 24 gcmaF6nCb0erUju~#=3@<3Pwg&2IiZ&LLb`z0CBwtL;wH) diff --git a/po/pl.po b/po/pl.po index 08b454ff..a8c487ef 100644 --- a/po/pl.po +++ b/po/pl.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: make 3.81-b3\n" "Report-Msgid-Bugs-To: bug-make@gnu.org\n" -"POT-Creation-Date: 2006-03-19 22:07-0500\n" +"POT-Creation-Date: 2006-04-01 01:40-0500\n" "PO-Revision-Date: 2005-06-28 18:41+0200\n" "Last-Translator: Jakub Bogusz \n" "Language-Team: Polish \n" @@ -391,22 +391,22 @@ msgstr "CreatePipe() nie powiod msgid "windows32_openpipe (): process_init_fd() failed\n" msgstr "windows32_openpipe (): process_init_fd() nie powiodo si\n" -#: function.c:1727 +#: function.c:1725 #, c-format msgid "Cleaning up temporary batch file %s\n" msgstr "Czyszcz tymczasowy plik wsadowy %s\n" -#: function.c:2105 +#: function.c:2101 #, fuzzy, c-format msgid "insufficient number of arguments (%d) to function `%s'" msgstr "Niewystarczajca liczba argumentw (%d) dla funkcji `%s'" -#: function.c:2117 +#: function.c:2113 #, fuzzy, c-format msgid "unimplemented on this platform: function `%s'" msgstr "Funkcja `%s' nie jest zaimplementowana na tej platformie" -#: function.c:2167 +#: function.c:2163 #, c-format msgid "unterminated call to function `%s': missing `%c'" msgstr "nie dokoczone wywoanie funkcji `%s': brak `%c'" @@ -506,32 +506,32 @@ msgstr "Pomijanie rekurencyjnego wywo msgid "Trying pattern rule with stem `%.*s'.\n" msgstr "Prbowanie reguy wzorcowej z gazi `%.*s'.\n" -#: implicit.c:658 +#: implicit.c:667 #, c-format msgid "Rejecting impossible implicit prerequisite `%s'.\n" msgstr "Odrzucenie niemoliwej zalenoci domylnej `%s'.\n" -#: implicit.c:659 +#: implicit.c:668 #, c-format msgid "Rejecting impossible rule prerequisite `%s'.\n" msgstr "Odrzucenie niemoliwej zalenoci reguy `%s'.\n" -#: implicit.c:669 +#: implicit.c:678 #, c-format msgid "Trying implicit prerequisite `%s'.\n" msgstr "Prbowanie zalenoci domylnej `%s'.\n" -#: implicit.c:670 +#: implicit.c:679 #, c-format msgid "Trying rule prerequisite `%s'.\n" msgstr "Prbowanie zalenoci reguy `%s'.\n" -#: implicit.c:701 +#: implicit.c:710 #, c-format msgid "Found prerequisite `%s' as VPATH `%s'\n" msgstr "Znaleziono zaleno `%s' jako VPATH `%s'\n" -#: implicit.c:721 +#: implicit.c:730 #, c-format msgid "Looking for a rule with intermediate file `%s'.\n" msgstr "Szukanie reguy zawierajcej plik przejciowy `%s'.\n" diff --git a/po/pt_BR.gmo b/po/pt_BR.gmo index 4a77dfccf0a81330ffba7317d21fcf8d66eef7a1..36586799e8b32b5ceebda5aa7bdebe80fb3c785b 100644 GIT binary patch delta 25 gcmey?%k-_6X+x4fmx-={p@M;-m5IUT9RDtJ0DCV8h5!Hn delta 25 gcmey?%k-_6X+x4fm$9y)rGk->m4W%@9RDtJ0DHIylmGw# diff --git a/po/pt_BR.po b/po/pt_BR.po index cca44362..95844ff2 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: GNU make 3.80\n" "Report-Msgid-Bugs-To: bug-make@gnu.org\n" -"POT-Creation-Date: 2006-03-19 22:07-0500\n" +"POT-Creation-Date: 2006-04-01 01:40-0500\n" "PO-Revision-Date: 2002-11-16 17:06+0300\n" "Last-Translator: Fbio Henrique F. Silva \n" "Language-Team: Brazilian Portuguese \n" @@ -390,22 +390,22 @@ msgstr "CreatePipe() falhou (e=%d)\n" msgid "windows32_openpipe (): process_init_fd() failed\n" msgstr "windows32_openpipe (): process_init_fd() falhou\n" -#: function.c:1727 +#: function.c:1725 #, c-format msgid "Cleaning up temporary batch file %s\n" msgstr "Apagando o arquivo de lote temporrio %s\n" -#: function.c:2105 +#: function.c:2101 #, fuzzy, c-format msgid "insufficient number of arguments (%d) to function `%s'" msgstr "O nmero de argumentos insuficiente (%d) para a funo `%s'" -#: function.c:2117 +#: function.c:2113 #, fuzzy, c-format msgid "unimplemented on this platform: function `%s'" msgstr "A funo `%s' no foi implementada nesta plataforma" -#: function.c:2167 +#: function.c:2163 #, c-format msgid "unterminated call to function `%s': missing `%c'" msgstr "Chamada no terminada para a funo `%s': faltando `%c'" @@ -504,32 +504,32 @@ msgstr "Evitando recurs msgid "Trying pattern rule with stem `%.*s'.\n" msgstr "Tentando padro para regra com `%.*s'.\n" -#: implicit.c:658 +#: implicit.c:667 #, c-format msgid "Rejecting impossible implicit prerequisite `%s'.\n" msgstr "Rejeitando pr-requisitos implcitos `%s'.\n" -#: implicit.c:659 +#: implicit.c:668 #, c-format msgid "Rejecting impossible rule prerequisite `%s'.\n" msgstr "Rejeitando pr-requisito para regra `%s'.\n" -#: implicit.c:669 +#: implicit.c:678 #, c-format msgid "Trying implicit prerequisite `%s'.\n" msgstr "Tentando pr-requisito implcito `%s'.\n" -#: implicit.c:670 +#: implicit.c:679 #, c-format msgid "Trying rule prerequisite `%s'.\n" msgstr "Tentanto pr-requisito para a regra `%s'.\n" -#: implicit.c:701 +#: implicit.c:710 #, c-format msgid "Found prerequisite `%s' as VPATH `%s'\n" msgstr "Pr-requisito `%s' encontrado como VPATH `%s'\n" -#: implicit.c:721 +#: implicit.c:730 #, c-format msgid "Looking for a rule with intermediate file `%s'.\n" msgstr "Procurando uma regra com o arquivo intermedirio `%s'.\n" diff --git a/po/ru.gmo b/po/ru.gmo index 232747c0e75994d6c5aeb61888de9a1007f2b59a..e656e326e808e7d041247e20d49a3704a3089ca3 100644 GIT binary patch delta 25 hcmZ2>iE-H_#tkvHTqe2(h6)CTRwf3U(`*lD0|0jE2xtHR delta 25 hcmZ2>iE-H_#tkvHT*kVFmI_8jRtDyq(`*lD0|0k&2zCGf diff --git a/po/ru.po b/po/ru.po index d93fed4b..131eb160 100644 --- a/po/ru.po +++ b/po/ru.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: make 3.79.1\n" "Report-Msgid-Bugs-To: bug-make@gnu.org\n" -"POT-Creation-Date: 2006-03-19 22:07-0500\n" +"POT-Creation-Date: 2006-04-01 01:40-0500\n" "PO-Revision-Date: 2002-01-07 19:34GMT+06\n" "Last-Translator: Denis Perchine \n" "Language-Team: Russian \n" @@ -395,22 +395,22 @@ msgstr "CreatePipe() msgid "windows32_openpipe (): process_init_fd() failed\n" msgstr "windows32_openpipe(): process_init_fd() \n" -#: function.c:1727 +#: function.c:1725 #, c-format msgid "Cleaning up temporary batch file %s\n" msgstr " %s\n" -#: function.c:2105 +#: function.c:2101 #, fuzzy, c-format msgid "insufficient number of arguments (%d) to function `%s'" msgstr " ( %d) `%s'" -#: function.c:2117 +#: function.c:2113 #, fuzzy, c-format msgid "unimplemented on this platform: function `%s'" msgstr " : `%s'" -#: function.c:2167 +#: function.c:2163 #, c-format msgid "unterminated call to function `%s': missing `%c'" msgstr " `%s': `%c'" @@ -512,32 +512,32 @@ msgstr " msgid "Trying pattern rule with stem `%.*s'.\n" msgstr " , `%.*s'.\n" -#: implicit.c:658 +#: implicit.c:667 #, c-format msgid "Rejecting impossible implicit prerequisite `%s'.\n" msgstr " `%s'.\n" -#: implicit.c:659 +#: implicit.c:668 #, c-format msgid "Rejecting impossible rule prerequisite `%s'.\n" msgstr " `%s'.\n" -#: implicit.c:669 +#: implicit.c:678 #, c-format msgid "Trying implicit prerequisite `%s'.\n" msgstr " `%s'.\n" -#: implicit.c:670 +#: implicit.c:679 #, c-format msgid "Trying rule prerequisite `%s'.\n" msgstr " `%s'.\n" -#: implicit.c:701 +#: implicit.c:710 #, c-format msgid "Found prerequisite `%s' as VPATH `%s'\n" msgstr " `%s' VPATH `%s'\n" -#: implicit.c:721 +#: implicit.c:730 #, c-format msgid "Looking for a rule with intermediate file `%s'.\n" msgstr " `%s'.\n" diff --git a/po/rw.gmo b/po/rw.gmo index c4d0d631cd5a66f0345b27fa0a6142f42743c954..3bcd6d4aca53765dcdc391ffc64177c7a75f353e 100644 GIT binary patch delta 23 ecmbQtI+=BYGb5LYu7RO~fuWU&!De4ZH%0(OdIeYj delta 23 ecmbQtI+=BYGb5L=uA!xZk&%^w`DR~6H%0(P0|jOP diff --git a/po/rw.po b/po/rw.po index de78026a..ab4fe38e 100644 --- a/po/rw.po +++ b/po/rw.po @@ -16,7 +16,7 @@ msgid "" msgstr "" "Project-Id-Version: make 3.80\n" "Report-Msgid-Bugs-To: bug-make@gnu.org\n" -"POT-Creation-Date: 2006-03-19 22:07-0500\n" +"POT-Creation-Date: 2006-04-01 01:40-0500\n" "PO-Revision-Date: 2005-04-04 10:55-0700\n" "Last-Translator: Steven Michael Murphy \n" "Language-Team: Kinyarwanda \n" @@ -430,22 +430,22 @@ msgstr "Byanze E" msgid "windows32_openpipe (): process_init_fd() failed\n" msgstr "" -#: function.c:1727 +#: function.c:1725 #, fuzzy, c-format msgid "Cleaning up temporary batch file %s\n" msgstr "Hejuru By'igihe gito IDOSIYE" -#: function.c:2105 +#: function.c:2101 #, fuzzy, c-format msgid "insufficient number of arguments (%d) to function `%s'" msgstr "Umubare Bya ingingo Kuri Umumaro" -#: function.c:2117 +#: function.c:2113 #, fuzzy, c-format msgid "unimplemented on this platform: function `%s'" msgstr "ku iyi Umumaro" -#: function.c:2167 +#: function.c:2163 #, fuzzy, c-format msgid "unterminated call to function `%s': missing `%c'" msgstr "Kuri Umumaro Ibuze" @@ -544,32 +544,32 @@ msgstr "" msgid "Trying pattern rule with stem `%.*s'.\n" msgstr "Ishusho Na:" -#: implicit.c:658 +#: implicit.c:667 #, c-format msgid "Rejecting impossible implicit prerequisite `%s'.\n" msgstr "" -#: implicit.c:659 +#: implicit.c:668 #, c-format msgid "Rejecting impossible rule prerequisite `%s'.\n" msgstr "" -#: implicit.c:669 +#: implicit.c:678 #, c-format msgid "Trying implicit prerequisite `%s'.\n" msgstr "" -#: implicit.c:670 +#: implicit.c:679 #, c-format msgid "Trying rule prerequisite `%s'.\n" msgstr "" -#: implicit.c:701 +#: implicit.c:710 #, fuzzy, c-format msgid "Found prerequisite `%s' as VPATH `%s'\n" msgstr "Nka" -#: implicit.c:721 +#: implicit.c:730 #, fuzzy, c-format msgid "Looking for a rule with intermediate file `%s'.\n" msgstr "kugirango a Na: IDOSIYE" diff --git a/po/sv.gmo b/po/sv.gmo index 8be325b9ab4570f0916c790612e0f454a39f590c..3dfc484fda742ded4718a45cf68820e19fbf3d14 100644 GIT binary patch delta 25 gcmbPml5xUG#tkvHTqe2(h6)CTRwf3U(`>cW0dN`zkN^Mx delta 25 gcmbPml5xUG#tkvHT*kVFmI_8jRtDyq(`>cW0dS)So&W#< diff --git a/po/sv.po b/po/sv.po index 72974e32..0bad8037 100644 --- a/po/sv.po +++ b/po/sv.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: make 3.79.1\n" "Report-Msgid-Bugs-To: bug-make@gnu.org\n" -"POT-Creation-Date: 2006-03-19 22:07-0500\n" +"POT-Creation-Date: 2006-04-01 01:40-0500\n" "PO-Revision-Date: 2002-08-02 14:28+0200\n" "Last-Translator: Tomas Gradin \n" "Language-Team: Swedish \n" @@ -388,22 +388,22 @@ msgstr "CreatePipe() misslyckades (e=%d)\n" msgid "windows32_openpipe (): process_init_fd() failed\n" msgstr "windows32_openpipe (): process_init_fd() misslyckades\n" -#: function.c:1727 +#: function.c:1725 #, c-format msgid "Cleaning up temporary batch file %s\n" msgstr "Stdar bort tillfllig omgngsfil %s\n" -#: function.c:2105 +#: function.c:2101 #, fuzzy, c-format msgid "insufficient number of arguments (%d) to function `%s'" msgstr "Otillrckligt antal argument (%d) till funktionen \"%s\"" -#: function.c:2117 +#: function.c:2113 #, fuzzy, c-format msgid "unimplemented on this platform: function `%s'" msgstr "Ej implementerat p denna plattform: funktionen \"%s\"" -#: function.c:2167 +#: function.c:2163 #, c-format msgid "unterminated call to function `%s': missing `%c'" msgstr "oavslutat funktionsanrop \"%s\": \"%c\" saknas" @@ -502,32 +502,32 @@ msgstr "Undviker rekursion orsakad av implicit regel.\n" msgid "Trying pattern rule with stem `%.*s'.\n" msgstr "Prvar mnsterregel med stammen \"%.*s\".\n" -#: implicit.c:658 +#: implicit.c:667 #, c-format msgid "Rejecting impossible implicit prerequisite `%s'.\n" msgstr "Avvisar det omjliga implicita beroendet \"%s\".\n" -#: implicit.c:659 +#: implicit.c:668 #, c-format msgid "Rejecting impossible rule prerequisite `%s'.\n" msgstr "Avvisar det omjliga regelbaserade beroendet \"%s\".\n" -#: implicit.c:669 +#: implicit.c:678 #, c-format msgid "Trying implicit prerequisite `%s'.\n" msgstr "Prvar det implicita beroendet \"%s\".\n" -#: implicit.c:670 +#: implicit.c:679 #, c-format msgid "Trying rule prerequisite `%s'.\n" msgstr "Prvar det regelbaserade beroendet \"%s\".\n" -#: implicit.c:701 +#: implicit.c:710 #, c-format msgid "Found prerequisite `%s' as VPATH `%s'\n" msgstr "Hittade den ndvndiga \"%s\" som VPATH \"%s\"\n" -#: implicit.c:721 +#: implicit.c:730 #, c-format msgid "Looking for a rule with intermediate file `%s'.\n" msgstr "Letar efter en regel med vergngsfilen \"%s\".\n" diff --git a/po/tr.gmo b/po/tr.gmo index 17cc79b73c7c05df74645021ee31b5dd2d41a544..07173332991baaa83d179a4387fb45a13cf5ed04 100644 GIT binary patch delta 25 fcmdlmjcEfA#rboY=o%O*7#Lca7;Mh)KVc03a1sbc delta 25 fcmdlmjcEfA#rbm?>l#`r7#Ud^m~YPTKVc03aGMBJ diff --git a/po/tr.po b/po/tr.po index f2cf4377..653c5858 100644 --- a/po/tr.po +++ b/po/tr.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: make 3.80\n" "Report-Msgid-Bugs-To: bug-make@gnu.org\n" -"POT-Creation-Date: 2006-03-19 22:07-0500\n" +"POT-Creation-Date: 2006-04-01 01:40-0500\n" "PO-Revision-Date: 2002-10-05 18:13+0300\n" "Last-Translator: Nilgün Belma Bugüner \n" "Language-Team: Turkish \n" @@ -392,22 +392,22 @@ msgstr "CreatePipe() başarısız (e=%d)\n" msgid "windows32_openpipe (): process_init_fd() failed\n" msgstr "windows32_openpipe (): process_init_fd() başarısız\n" -#: function.c:1727 +#: function.c:1725 #, c-format msgid "Cleaning up temporary batch file %s\n" msgstr "Geçici komut-listesi (batch) dosyası %s temizleniyor\n" -#: function.c:2105 +#: function.c:2101 #, fuzzy, c-format msgid "insufficient number of arguments (%d) to function `%s'" msgstr "Argüman sayısı (%d) `%s' işlevinde yetersiz" -#: function.c:2117 +#: function.c:2113 #, fuzzy, c-format msgid "unimplemented on this platform: function `%s'" msgstr "Bu platformda gerçekleştirilmemiş: işlev `%s'" -#: function.c:2167 +#: function.c:2163 #, c-format msgid "unterminated call to function `%s': missing `%c'" msgstr "`%s' işlemine çağrı sonlandırılmamış: `%c' kayıp" @@ -506,32 +506,32 @@ msgstr "Örtük kural çevrimi görmezden geliniyor.\n" msgid "Trying pattern rule with stem `%.*s'.\n" msgstr "`%.*s' köküyle kalıp kuralı deneniyor.\n" -#: implicit.c:658 +#: implicit.c:667 #, c-format msgid "Rejecting impossible implicit prerequisite `%s'.\n" msgstr "Örtük önceden gereklilik `%s' olanaksız olduğundan reddediliyor.\n" -#: implicit.c:659 +#: implicit.c:668 #, c-format msgid "Rejecting impossible rule prerequisite `%s'.\n" msgstr "Kural önceden gerekliliği `%s' olanaksız olduğundan reddediliyor.\n" -#: implicit.c:669 +#: implicit.c:678 #, c-format msgid "Trying implicit prerequisite `%s'.\n" msgstr "Örtük önceden gereklilik `%s' deneniyor.\n" -#: implicit.c:670 +#: implicit.c:679 #, c-format msgid "Trying rule prerequisite `%s'.\n" msgstr "Kural önceden gerekliliği `%s' deneniyor.\n" -#: implicit.c:701 +#: implicit.c:710 #, c-format msgid "Found prerequisite `%s' as VPATH `%s'\n" msgstr "Önceden gereklilik `%s' VPATH `%s' olarak bulundu.\n" -#: implicit.c:721 +#: implicit.c:730 #, c-format msgid "Looking for a rule with intermediate file `%s'.\n" msgstr "Aracı dosya `%s' ile bir kural arıyor.\n" diff --git a/po/uk.gmo b/po/uk.gmo index 4000e3363b138312c868f28d76a1385fc049d50e..ed1f2c25e3c28d8d66d3fdd1d2ebdafb6d74e698 100644 GIT binary patch delta 25 hcmZ2Am2uTn#tr*)xJ+~n3>6FvtxOCypU`\n" "Language-Team: Ukrainian \n" @@ -397,22 +397,22 @@ msgstr "" msgid "windows32_openpipe (): process_init_fd() failed\n" msgstr "" -#: function.c:1727 +#: function.c:1725 #, c-format msgid "Cleaning up temporary batch file %s\n" msgstr "" -#: function.c:2105 +#: function.c:2101 #, fuzzy, c-format msgid "insufficient number of arguments (%d) to function `%s'" msgstr " æ \"word\"" -#: function.c:2117 +#: function.c:2113 #, fuzzy, c-format msgid "unimplemented on this platform: function `%s'" msgstr " ̦ æ ͦ: æ \"%s\"" -#: function.c:2167 +#: function.c:2163 #, c-format msgid "unterminated call to function `%s': missing `%c'" msgstr " æ \"%s\"; \"%c\"" @@ -511,32 +511,32 @@ msgstr " msgid "Trying pattern rule with stem `%.*s'.\n" msgstr " ڦ , \"%.*s\".\n" -#: implicit.c:658 +#: implicit.c:667 #, fuzzy, c-format msgid "Rejecting impossible implicit prerequisite `%s'.\n" msgstr " ϧ %s Ԧ \"%s\".\n" -#: implicit.c:659 +#: implicit.c:668 #, fuzzy, c-format msgid "Rejecting impossible rule prerequisite `%s'.\n" msgstr " ϧ %s Ԧ \"%s\".\n" -#: implicit.c:669 +#: implicit.c:678 #, c-format msgid "Trying implicit prerequisite `%s'.\n" msgstr " Φ Ԧ \"%s\".\n" -#: implicit.c:670 +#: implicit.c:679 #, c-format msgid "Trying rule prerequisite `%s'.\n" msgstr " Φ \"%s\".\n" -#: implicit.c:701 +#: implicit.c:710 #, c-format msgid "Found prerequisite `%s' as VPATH `%s'\n" msgstr "" -#: implicit.c:721 +#: implicit.c:730 #, c-format msgid "Looking for a rule with intermediate file `%s'.\n" msgstr " ͦ \"%s\".\n" diff --git a/po/vi.gmo b/po/vi.gmo index e62430c90acffdb6420d9e52d87806741119071b..a3c334dfcc9265639f0e63dd2a2924fc53f62260 100644 GIT binary patch delta 24 gcmZ2^o@wQIrUju~Cb|ZO3I>K&CI*|iLgxno0BkY`*Z=?k delta 24 gcmZ2^o@wQIrUju~#=3@<3Pwg&2IiZ&Lgxno0BpMl<^TWy diff --git a/po/vi.po b/po/vi.po index 72ee29e1..7664c9f9 100644 --- a/po/vi.po +++ b/po/vi.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: make-3.81-b3\n" "Report-Msgid-Bugs-To: bug-make@gnu.org\n" -"POT-Creation-Date: 2006-03-19 22:07-0500\n" +"POT-Creation-Date: 2006-04-01 01:40-0500\n" "PO-Revision-Date: 2006-02-05 19:19+1030\n" "Last-Translator: Clytie Siddall \n" "Language-Team: Vietnamese \n" @@ -402,22 +402,22 @@ msgstr "" "Việc « windows32_openpipe (): process_init_fd() » (mở ống dẫn windows32: " "tiến trình sở khởi fd) bị lỗi\n" -#: function.c:1727 +#: function.c:1725 #, c-format msgid "Cleaning up temporary batch file %s\n" msgstr "Đang làm sạch tập tin bó tạm thời %s...\n" -#: function.c:2105 +#: function.c:2101 #, fuzzy, c-format msgid "insufficient number of arguments (%d) to function `%s'" msgstr "Không có đủ đối số (%d) đối với hàm « %s »" -#: function.c:2117 +#: function.c:2113 #, fuzzy, c-format msgid "unimplemented on this platform: function `%s'" msgstr "Chưa được thực hiện trên nền tảng này: hàm « %s »" -#: function.c:2167 +#: function.c:2163 #, c-format msgid "unterminated call to function `%s': missing `%c'" msgstr "cuộc gọi chưa được kết thúc cho hàm « %s »: thiếu « %c »" @@ -516,32 +516,32 @@ msgstr "Đang tránh sự đệ qui quy tắc ngầm.\n" msgid "Trying pattern rule with stem `%.*s'.\n" msgstr "Đang thử quy tắc mẫu với cuống « %.*s ».\n" -#: implicit.c:658 +#: implicit.c:667 #, c-format msgid "Rejecting impossible implicit prerequisite `%s'.\n" msgstr "Đang từ chối điều kiện tiên quyết ngầm không thể « %s ».\n" -#: implicit.c:659 +#: implicit.c:668 #, c-format msgid "Rejecting impossible rule prerequisite `%s'.\n" msgstr "Đang từ chối điều kiện tiên quyết không thể « %s ».\n" -#: implicit.c:669 +#: implicit.c:678 #, c-format msgid "Trying implicit prerequisite `%s'.\n" msgstr "Đang thử điều kiện tiên quyết ngầm « %s ».\n" -#: implicit.c:670 +#: implicit.c:679 #, c-format msgid "Trying rule prerequisite `%s'.\n" msgstr "Đang thử điều kiện tiên quyết quy tắc « %s ».\n" -#: implicit.c:701 +#: implicit.c:710 #, c-format msgid "Found prerequisite `%s' as VPATH `%s'\n" msgstr "Mới tìm điều kiện tiên quyết « %s » dạng VPATH « %s »\n" -#: implicit.c:721 +#: implicit.c:730 #, c-format msgid "Looking for a rule with intermediate file `%s'.\n" msgstr "Đang tìm quy tắc với tập tin trung cấp « %s ».\n" diff --git a/po/zh_CN.gmo b/po/zh_CN.gmo index df42ce92aad38fd8d162f34ae987f2398bfc1e57..2342719f8eb976e23fd868c0e4c8be90f9597620 100644 GIT binary patch delta 25 hcmcaGkMY7h#tqL+xlD8o3>6FvtxOCye>9Dk1OR{e29Dk1OR}72=xE} diff --git a/po/zh_CN.po b/po/zh_CN.po index e3186c92..15b149be 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: make 3.79.1\n" "Report-Msgid-Bugs-To: bug-make@gnu.org\n" -"POT-Creation-Date: 2006-03-19 22:07-0500\n" +"POT-Creation-Date: 2006-04-01 01:40-0500\n" "PO-Revision-Date: 2002-07-22 15:02+0800\n" "Last-Translator: Wang Li \n" "Language-Team: Chinese (simplified) \n" @@ -385,22 +385,22 @@ msgstr "CreatePipe() ʧ msgid "windows32_openpipe (): process_init_fd() failed\n" msgstr "windows32_openpipe ()process_init_fd() ʧ\n" -#: function.c:1727 +#: function.c:1725 #, c-format msgid "Cleaning up temporary batch file %s\n" msgstr "ʱļ %s\n" -#: function.c:2105 +#: function.c:2101 #, fuzzy, c-format msgid "insufficient number of arguments (%d) to function `%s'" msgstr "%2$sIJ (%1$d)" -#: function.c:2117 +#: function.c:2113 #, fuzzy, c-format msgid "unimplemented on this platform: function `%s'" msgstr "ڱƽ̨δʵ֣%s" -#: function.c:2167 +#: function.c:2163 #, c-format msgid "unterminated call to function `%s': missing `%c'" msgstr "Ժ%sδֹĵã©%c" @@ -499,32 +499,32 @@ msgstr " msgid "Trying pattern rule with stem `%.*s'.\n" msgstr "ɡ%.*sƥģʽ\n" -#: implicit.c:658 +#: implicit.c:667 #, c-format msgid "Rejecting impossible implicit prerequisite `%s'.\n" msgstr "ܾܵǰᡰ%s\n" -#: implicit.c:659 +#: implicit.c:668 #, c-format msgid "Rejecting impossible rule prerequisite `%s'.\n" msgstr "ܾܵĹǰᡰ%s\n" -#: implicit.c:669 +#: implicit.c:678 #, c-format msgid "Trying implicit prerequisite `%s'.\n" msgstr "ǰᡰ%s\n" -#: implicit.c:670 +#: implicit.c:679 #, c-format msgid "Trying rule prerequisite `%s'.\n" msgstr "Թǰᡰ%s\n" -#: implicit.c:701 +#: implicit.c:710 #, c-format msgid "Found prerequisite `%s' as VPATH `%s'\n" msgstr "" -#: implicit.c:721 +#: implicit.c:730 #, c-format msgid "Looking for a rule with intermediate file `%s'.\n" msgstr "Ѱʹмļ%sĹ\n" diff --git a/tests/ChangeLog b/tests/ChangeLog index e1241cfe..3e3520f2 100644 --- a/tests/ChangeLog +++ b/tests/ChangeLog @@ -1,3 +1,8 @@ +2006-04-01 Paul D. Smith + + * scripts/functions/realpath: Don't run tests with multiple + initial slashes on Windows: those paths mean something different. + 2006-03-19 Paul D. Smith * scripts/features/parallelism: Test that the jobserver is diff --git a/tests/scripts/features/parallelism b/tests/scripts/features/parallelism index 9eb196dc..abe49a5d 100644 --- a/tests/scripts/features/parallelism +++ b/tests/scripts/features/parallelism @@ -128,31 +128,37 @@ mod_a.o mod_b.o: # Make sure that all jobserver FDs are closed if we need to re-exec the # master copy. +# +# First, find the "default" file descriptors we normally use +# Then make sure they're still used. +# +# Right now we don't have a way to run a makefile and capture the output +# without checking it, so we can't really write this test. -run_make_test(' -submake: ; @$(MAKE) --no-print-directory -f #MAKEFILE# fdprint 5>output +# run_make_test(' +# submake: ; @$(MAKE) --no-print-directory -f #MAKEFILE# fdprint 5>output -dependfile: ; @echo FOO=bar > $@ +# dependfile: ; @echo FOO=bar > $@ -INCL := true +# INCL := true -FOO=foo -ifeq ($(INCL),true) --include dependfile -endif +# FOO=foo +# ifeq ($(INCL),true) +# -include dependfile +# endif -fdprint: ; @echo hi >&5 && echo "$(FOO)" +# fdprint: ; @echo $(filter --jobserver%,$(MAKEFLAGS)) -recurse: ; @$(MAKE) --no-print-directory -f #MAKEFILE# submake INCL=true', - '-j2', - 'bar'); +# recurse: ; @$(MAKE) --no-print-directory -f #MAKEFILE# submake INCL=true', +# '-j2 INCL=false fdprint', +# 'bar'); -unlink('dependfile', 'output'); +# unlink('dependfile', 'output'); -# Do it again, this time where the include is done by the non-master make. -run_make_test(undef, '-j2 recurse INCL=false', 'bar'); +# # Do it again, this time where the include is done by the non-master make. +# run_make_test(undef, '-j2 recurse INCL=false', 'bar'); -unlink('dependfile', 'output'); +# unlink('dependfile', 'output'); 1; diff --git a/tests/scripts/functions/realpath b/tests/scripts/functions/realpath index 720af8be..9b503b42 100644 --- a/tests/scripts/functions/realpath +++ b/tests/scripts/functions/realpath @@ -20,18 +20,10 @@ ifneq ($(realpath /),/) $(error ) endif -ifneq ($(realpath ///),/) - $(error ) -endif - ifneq ($(realpath /.),/) $(error ) endif -ifneq ($(realpath ///.),/) - $(error ) -endif - ifneq ($(realpath /./),/) $(error ) endif @@ -44,10 +36,6 @@ ifneq ($(realpath /..),/) $(error ) endif -ifneq ($(realpath ///..),/) - $(error ) -endif - ifneq ($(realpath /../),/) $(error ) endif @@ -63,8 +51,31 @@ endif .PHONY: all all: ; @: ', -'', -''); + '', + ''); + +# On Windows platforms, "//" means something special. So, don't do these +# tests there. + +if ($port_type ne 'W32') { + run_make_test(' +ifneq ($(realpath ///),/) + $(error ) +endif + +ifneq ($(realpath ///.),/) + $(error ) +endif + +ifneq ($(realpath ///..),/) + $(error ) +endif + +.PHONY: all +all: ; @:', + '', + ''); +} # This tells the test driver that the perl test script executed properly. diff --git a/w32/Makefile b/w32/Makefile index 0f232874..7216b625 100644 --- a/w32/Makefile +++ b/w32/Makefile @@ -139,9 +139,9 @@ OBJEXT = o PACKAGE = make PACKAGE_BUGREPORT = bug-make@gnu.org PACKAGE_NAME = GNU make -PACKAGE_STRING = GNU make 3.81rc2 +PACKAGE_STRING = GNU make 3.81 PACKAGE_TARNAME = make -PACKAGE_VERSION = 3.81rc2 +PACKAGE_VERSION = 3.81 PATH_SEPARATOR = : PERL = perl POSUB = po @@ -156,7 +156,7 @@ USE_CUSTOMS_TRUE = # USE_LOCAL_GLOB_FALSE = USE_LOCAL_GLOB_TRUE = # USE_NLS = yes -VERSION = 3.81rc2 +VERSION = 3.81 WINDOWSENV_FALSE = WINDOWSENV_TRUE = # XGETTEXT = /usr/bin/xgettext