* tests/Makefile.am (edit, $(wrappers)): Do not use `$<' in

non-suffix rule.
($(TESTSUITE_GENERATED_AT)): Use `$(srcdir)` for the benefit of
non-GNU make.
(autoconfdir, $(AUTOCONF_FILES)): Likewise.
* tests/mktests.sh: Small shell portability fixes.
This commit is contained in:
Ralf Wildenhues 2006-03-06 21:13:21 +00:00
parent bb44ff85bc
commit 66bf4ecdc9
3 changed files with 36 additions and 17 deletions

View File

@ -1,3 +1,12 @@
2006-03-06 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
* tests/Makefile.am (edit, $(wrappers)): Do not use `$<' in
non-suffix rule.
($(TESTSUITE_GENERATED_AT)): Use `$(srcdir)` for the benefit of
non-GNU make.
(autoconfdir, $(AUTOCONF_FILES)): Likewise.
* tests/mktests.sh: Small shell portability fixes.
2006-03-05 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
* doc/autoconf.texi (Caching Results): Fix the examples to use a

View File

@ -63,10 +63,11 @@ edit = sed \
-e 's|@wrap_program[@]|$@|g' \
-e 's|@abs_top_srcdir[@]|@abs_top_srcdir@|g' \
-e 's|@abs_top_builddir[@]|@abs_top_builddir@|g' \
-e 's|@configure_input[@]|Generated from $<.|g'
-e "s|@configure_input[@]|Generated from $$input.|g"
$(wrappers): wrapper.in
rm -f $@ $@.tmp
input=wrapper.in; \
$(edit) wrapper.in >$@.tmp
chmod +x $@.tmp
chmod a-w $@.tmp
@ -79,11 +80,19 @@ $(wrappers): wrapper.in
## ------------ ##
TESTSUITE_GENERATED_AT = \
aclang.at acc.at acfortran.at \
acgeneral.at acstatus.at \
acautoheader.at acautoupdate.at \
acspecific.at acfunctions.at acheaders.at actypes.at \
aclibs.at acprograms.at
$(srcdir)/aclang.at \
$(srcdir)/acc.at \
$(srcdir)/acfortran.at \
$(srcdir)/acgeneral.at \
$(srcdir)/acstatus.at \
$(srcdir)/acautoheader.at \
$(srcdir)/acautoupdate.at \
$(srcdir)/acspecific.at \
$(srcdir)/acfunctions.at \
$(srcdir)/acheaders.at \
$(srcdir)/actypes.at \
$(srcdir)/aclibs.at \
$(srcdir)/acprograms.at
TESTSUITE_HAND_AT = \
suite.at \
@ -134,10 +143,10 @@ MAINTAINERCLEANFILES += $(TESTSUITE_GENERATED_AT)
## Producing the test files.
# The files which contains macro we check for syntax. Don't use $(top_srcdir)
# here since below we explicitly `cd' to $srcdir. As for the dependencies,
# thanks God for VPATH. Hm...
autoconfdir = ../lib/autoconf
# The files which contains macro we check for syntax. Use $(top_srcdir)
# for the benefit of non-GNU make. Fix the names in the rule below
# where we `cd' to $srcdir.
autoconfdir = $(top_srcdir)/lib/autoconf
AUTOCONF_FILES = $(autoconfdir)/general.m4 \
$(autoconfdir)/status.m4 \
$(autoconfdir)/autoheader.m4 \
@ -153,7 +162,8 @@ AUTOCONF_FILES = $(autoconfdir)/general.m4 \
$(autoconfdir)/programs.m4
$(TESTSUITE_GENERATED_AT): mktests.sh $(AUTOCONF_FILES)
cd $(srcdir) && ./mktests.sh $(AUTOCONF_FILES)
cd $(srcdir) && ./mktests.sh \
`echo " "$(AUTOCONF_FILES) | sed 's, [^ ]*/, ../lib/autoconf/,g'`
## maintainer-check ##

View File

@ -2,7 +2,7 @@
# Build some of the Autoconf test files.
# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 Free Software
# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software
# Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
@ -28,7 +28,7 @@ as_me=`echo "$0" | sed 's,.*[\\/],,'`
trap 'echo "'"$as_me"': failed. To proceed run make check." >&2
rm -f acdefuns audefuns requires *.tat
for file in "$@"
for file
do
touch `echo "$file" | sed "s,.*[\\/],,;s/\..*/.at/"`
done
@ -46,9 +46,9 @@ test $# != 0
src="$@"
# Set locale to C so that `sort' behaves in a uniform way.
export LANGUAGE; LANGUAGE=C
export LANG; LANG=C
export LC_ALL; LC_ALL=C
LANGUAGE=C; export LANGUAGE
LANG=C; export LANG
LC_ALL=C export LC_ALL
# requires