Use $CONFIG_HEADER, rather than hard-coding it.

* tests/rm/Makefile.am (TESTS_ENVIRONMENT): Set $CONFIG_HEADER.

diff --git a/ChangeLog b/ChangeLog
index d19671ed68a72bdfd17c0f37421371cb8dc60d28..0dc620e33209e5436af4ceca25ff4d77d046ac46 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
 2006-09-03  Jim Meyering  <jim@meyering.net>
 
        * tests/rm/inaccessible: Adjust for movement of config.h to lib/.
+       Use $CONFIG_HEADER, rather than hard-coding it.
+       * tests/rm/Makefile.am (TESTS_ENVIRONMENT): Set $CONFIG_HEADER.
 
 2006-09-02  Paul Eggert  <eggert@cs.ucla.edu>
 

diff --git a/tests/rm/Makefile.am b/tests/rm/Makefile.am
index cfc4be08ddd38abbcae02294cbaf662423f0742c..958b03ef61f806a569db2f5ff4fb53ce47372c33 100644 (file)
--- a/tests/rm/Makefile.am
+++ b/tests/rm/Makefile.am
@@ -38,6 +38,7 @@ EXTRA_DIST = $(TESTS)
 TESTS_ENVIRONMENT = \
   RM=../../src/rm \
   MKDIR=../../src/mkdir \
+  CONFIG_HEADER=$(CONFIG_HEADER) \
   top_srcdir=$(top_srcdir) \
   srcdir=$(srcdir) \
   PERL="$(PERL)" \

diff --git a/tests/rm/inaccessible b/tests/rm/inaccessible
index e2c3cd791e82cbc8234953b30ee96ba64e7a192c..08c5e324569aaf8478943d4c9296f3731a6ee3e9 100755 (executable)
--- a/tests/rm/inaccessible
+++ b/tests/rm/inaccessible
@@ -30,7 +30,7 @@ PRIV_CHECK_ARG=require-non-root . $srcdir/../priv-check
 # Skip this test if your system has neither the openat-style functions
 # nor /proc/self/fd support with which to emulate them.
 skip=yes
-grep '^#define HAVE_OPENAT' $top_srcdir/lib/config.h > /dev/null && skip=no
+grep '^#define HAVE_OPENAT' $CONFIG_HEADER > /dev/null && skip=no
 test -d /proc/self/fd && skip=no
 if test $skip = yes; then
   echo 1>&2 "$0: no openat support, so skipping this test"