diff options
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/build/configure | 2 | ||||
| -rwxr-xr-x | tools/update/acpolish | 15 |
2 files changed, 11 insertions, 6 deletions
diff --git a/tools/build/configure b/tools/build/configure index 6ebc34b503..4cbbc7b517 100644 --- a/tools/build/configure +++ b/tools/build/configure @@ -1378,7 +1378,6 @@ ac_given_INSTALL="$INSTALL" trap 'rm -fr `echo "Makefile install-if-change lock-directory -rcs-clean unlock-directory config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 EOF @@ -1479,7 +1478,6 @@ cat >> $CONFIG_STATUS <<EOF CONFIG_FILES=\${CONFIG_FILES-"Makefile install-if-change lock-directory -rcs-clean unlock-directory "} EOF diff --git a/tools/update/acpolish b/tools/update/acpolish index 6cb14f3586..b86c225111 100755 --- a/tools/update/acpolish +++ b/tools/update/acpolish @@ -404,10 +404,17 @@ sub subst_line { # makefile variable addition # print STDERR "MACRO: <$1> += <$2>\n"; my $p = "$1" ; - ${"var_$p+"}="$2" ; - # place a marker - push @tbuf, "§5$p\n" ; - push @vars, "$p+" ; + if ( not defined ${"var_$p+"} ) + { + # place a marker + push @tbuf, "§5$p\n" ; + push @vars, "$p+" ; + } + else + { + print STDERR "WARNING += $_" ; + } + ${"var_$p+"} .=" $2" ; } elsif ( /^[\s]*(\@[^\s]+\@)$/o ) { # autoconf variable |