From bd4095101256ca29ab0b3a5972733f985554a7e5 Mon Sep 17 00:00:00 2001 From: Alexandre Duret-Lutz Date: Sun, 5 Jan 2003 22:51:09 +0000 Subject: [PATCH] * automake.in (macro_define): Add missing `{$cond}' (typo from 2002-09-18). ($gen_copyright): Append year 2003. (version): Increase year. --- ChangeLog | 5 +++++ automake.in | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3e8b6caa..e7c67459 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2003-01-05 Alexandre Duret-Lutz + * automake.in (macro_define): Add missing `{$cond}' (typo from + 2002-09-18). + ($gen_copyright): Append year 2003. + (version): Increase year. + * tests/defs.in: Substitute aclocaldir instead of running the installed aclocal. Otherwise Libtool and Gettext tests get skipped when aclocal doesn't preexist. diff --git a/automake.in b/automake.in index b0d3764f..961e887e 100755 --- a/automake.in +++ b/automake.in @@ -6,7 +6,7 @@ eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac' if 0; # automake - create Makefile.in from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 # Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify @@ -268,7 +268,7 @@ my %ac_macro_for_var = # Copyright on generated Makefile.ins. my $gen_copyright = "\ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 # Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -6247,7 +6247,7 @@ sub macro_define ($$$$$$) # If Automake tries to override a value specified by the user, # just don't let it do. if (exists $var_value{$var}{$cond} - && $var_owner{$var} != VAR_AUTOMAKE + && $var_owner{$var}{$cond} != VAR_AUTOMAKE && $owner == VAR_AUTOMAKE) { verb ("refusing to override the user definition of:\n" @@ -8995,7 +8995,7 @@ sub version () automake (GNU $PACKAGE) $VERSION Written by Tom Tromey . -Copyright 2002 Free Software Foundation, Inc. +Copyright 2003 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. EOF -- 2.43.5