From 9b3bb934bcb7b892921cfd9560d34363d8de57b9 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Sat, 19 Aug 2006 16:02:11 +0000 Subject: Some of my 2006-07-03 changes to tests/*/Makefile.am were being backed out due to updates provoked by the copyright changes. * tests/Makefile.am.in (PATH): Prepend $(VG_PATH_PREFIX), so that it propagates to the derived Makefile.am files. ($(srcdir)/Makefile.am): Mark generated .am files as read-only, so we don't mistakenly edit them again. * tests/cut/Makefile.am: Regenerate. * tests/head/Makefile.am: Likewise. * tests/join/Makefile.am: Likewise. * tests/pr/Makefile.am: Likewise. * tests/sort/Makefile.am: Likewise. * tests/tac/Makefile.am: Likewise. * tests/tail/Makefile.am: Likewise. * tests/test/Makefile.am: Likewise. * tests/tr/Makefile.am: Likewise. * tests/uniq/Makefile.am: Likewise. * tests/wc/Makefile.am: Likewise. --- tests/Makefile.am.in | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'tests/Makefile.am.in') diff --git a/tests/Makefile.am.in b/tests/Makefile.am.in index 9002cab05..bcd7d7955 100644 --- a/tests/Makefile.am.in +++ b/tests/Makefile.am.in @@ -1,6 +1,6 @@ # Make coreutils tests. -*-Makefile-*- -# Copyright (C) 1997, 1998, 2000, 2003, 2004 Free Software +# Copyright (C) 1997, 1998, 2000, 2003, 2004, 2006 Free Software # Foundation, Inc. # This program is free software; you can redistribute it and/or modify @@ -24,7 +24,7 @@ EXTRA_DIST = Test.pm $x-tests $(explicit) $(maint_gen) noinst_SCRIPTS = $x-tests TESTS_ENVIRONMENT = \ - PATH="`pwd`/../../src$(PATH_SEPARATOR)$$PATH" + PATH="$(VG_PATH_PREFIX)`pwd`/../../src$(PATH_SEPARATOR)$$PATH" editpl = sed -e 's,@''PERL''@,$(PERL),g' -e 's,@''srcdir''@,$(srcdir),g' @@ -49,4 +49,5 @@ $(srcdir)/Makefile.am: ../Makefile.am.in Test.pm $(mk_script) echo "x = $$tool" >> $@t $(PERL) -I$(srcdir) -w -- $(mk_script) $(srcdir) --list >> $@t sed -n '/^##test-files-end/,$$p' $(srcdir)/../Makefile.am.in >> $@t + chmod -w $@t mv $@t $@ -- cgit v1.2.3-54-g00ecf