From: Edin Kadribasic Date: Sun, 13 Jan 2002 23:51:56 +0000 (+0000) Subject: Fixed build in the directory other than $top_srcdir. X-Git-Tag: PRE_ISSET_PATCH~199 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2af5118d35206eb2d99003bfc95fa646bd824b2a;p=php Fixed build in the directory other than $top_srcdir. --- diff --git a/acinclude.m4 b/acinclude.m4 index 3c737d2a4b..c4f9c26e6b 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -930,7 +930,7 @@ dnl ---------------------------------------------- External Module if test "$2" != "shared" && test "$2" != "yes"; then dnl ---------------------------------------------- Static module LIB_BUILD($ext_builddir) - EXT_LTLIBS="$EXT_LTLIBS $abs_srcdir/$ext_builddir/lib$1.la" + EXT_LTLIBS="$EXT_LTLIBS $abs_builddir/$ext_builddir/lib$1.la" EXT_STATIC="$EXT_STATIC $1" else dnl ---------------------------------------------- Shared module diff --git a/sapi/cli/Makefile.in b/sapi/cli/Makefile.in index 90f0e0d63a..0a10b98860 100644 --- a/sapi/cli/Makefile.in +++ b/sapi/cli/Makefile.in @@ -2,11 +2,11 @@ LTLIBRARY_NAME = libphp4cli.la LTLIBRARY_SOURCES = php_cli.c getopt.c LTLIBRARY_DEPENDENCIES = \ - $(top_srcdir)/Zend/libZend.la \ - $(top_srcdir)/main/libmain.la \ - $(top_srcdir)/$(REGEX_LIB) \ + $(top_builddir)/Zend/libZend.la \ + $(top_builddir)/main/libmain.la \ + $(top_builddir)/$(REGEX_LIB) \ $(EXT_LTLIBS) \ - $(top_srcdir)/$(TSRM_LIB) + $(top_builddir)/$(TSRM_LIB) LTLIBRARY_LDFLAGS = -rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) LTLIBRARY_LIBADD = $(LTLIBRARY_DEPENDENCIES) $(EXTRA_LIBS)