From d4fd9a58cfd5a88d92aadf2ac62df25c340b8876 Mon Sep 17 00:00:00 2001 From: Hartmut Holzgraefe Date: Mon, 8 Aug 2005 17:49:32 +0000 Subject: [PATCH] put the -d extension loading options in the right place, get rid of basename --- Makefile.global | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.global b/Makefile.global index d4a92a2e27..62d4a61b1f 100644 --- a/Makefile.global +++ b/Makefile.global @@ -47,12 +47,12 @@ install-modules: build-modules install-su: install-pear -test: +test: all -@if test ! -z $(PHP_EXECUTABLE) && test -x $(PHP_EXECUTABLE); then \ TEST_PHP_EXECUTABLE=$(PHP_EXECUTABLE) \ TEST_PHP_SRCDIR=$(top_srcdir) \ CC="$(CC)" \ - $(PHP_EXECUTABLE) -d 'extension_dir=modules/' -d 'extension='`basename $(PHP_MODULES) .la`'.so' -d 'open_basedir=' -d 'safe_mode=0' -d 'output_buffering=0' -d 'memory_limit=-1' $(top_srcdir)/run-tests.php tests/; \ + $(PHP_EXECUTABLE) -d 'open_basedir=' -d 'safe_mode=0' -d 'output_buffering=0' -d 'memory_limit=-1' $(top_srcdir)/run-tests.php -d 'extension_dir=modules/' -d `( . $(PHP_MODULES) ; echo extension=$$dlname)` tests/; \ elif test ! -z $(SAPI_CLI_PATH) && test -x $(SAPI_CLI_PATH); then \ TEST_PHP_EXECUTABLE=$(top_builddir)/$(SAPI_CLI_PATH) \ TEST_PHP_SRCDIR=$(top_srcdir) \ -- 2.40.0