From f27e05f3aaf4aca49385c8de0bc2a7c7ee79109e Mon Sep 17 00:00:00 2001 From: Neal Walfield Date: Thu, 5 Sep 2002 00:44:29 +0000 Subject: [PATCH] 2002-09-04 Neal H. Walfield * Makefile.am (inittests.stamp): Do not set LD_LIBRARY_PATH, but rather prepend it. Be more robust and prefer printf over echo -n. --- tests/ChangeLog | 7 ++++++- tests/Makefile.am | 12 +++++++++--- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/tests/ChangeLog b/tests/ChangeLog index 940a37bf5..d9ff7eb8f 100644 --- a/tests/ChangeLog +++ b/tests/ChangeLog @@ -1,3 +1,8 @@ +2002-09-04 Neal H. Walfield + + * Makefile.am (inittests.stamp): Do not set LD_LIBRARY_PATH, but + rather prepend it. Be more robust and prefer printf over echo -n. + 2002-09-04 Marcus Brinkmann * asschk.c (start_server): Close the parent's file descriptors in @@ -5,7 +10,7 @@ (read_assuan): Variable NREAD removed. Cut off the received line currectly if more than one line was read. -2002-09-03 Neal H. Walfield +2002-09-03 Neal H. Walfield * Makefile.am (inittests.stamp): Construct an LD_LIBRARY_PATH from LDFLAGS. diff --git a/tests/Makefile.am b/tests/Makefile.am index 960b14bc2..b2fa56704 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -62,11 +62,17 @@ inittests.stamp: inittests then \ seen=1; \ else \ - echo -n ":"; \ + printf ":"; \ fi; \ - echo -n $${i} | sed 's/^-L//'; \ + printf "%s" "$${i}" | sed 's/^-L//'; \ fi; \ - done) \ + done; \ + if test $$seen != 0 \ + && test x$${LD_LIBRARY_PATH} != x; \ + then \ + printf ":"; \ + fi; \ + printf "%s" "$${LD_LIBRARY_PATH}") \ srcdir=$(srcdir) $(TESTS_ENVIRONMENT) $(srcdir)/inittests echo timestamp >./inittests.stamp