From: Sascha Schumann <sas@php.net>
Date: Mon, 27 Sep 1999 16:49:23 +0000 (+0000)
Subject:     * include from $(srcdir)
X-Git-Tag: PRE_FETCH_READ_PATCH~8
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e846baa14b0a0559e160ba279a8676ed1add2e65;p=php

* include from $(srcdir)
    * use proper target for nsapi
---

diff --git a/Makefile.in b/Makefile.in
index 992bf7ad3f..fdbbe5677d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -97,7 +97,7 @@ maintainer-clean-depend-recursive:
 		(cd $$subdir && $(MAKE) $$target) || fail=yes; \
 	done && test -z "$$fail"
 
-include sapi/$(PHP_SAPI)/Makefile.inc
+include $(srcdir)/sapi/$(PHP_SAPI)/Makefile.inc
 
 regex/libregex.a:
 	(cd regex; $(MAKE) lib)
diff --git a/sapi/aolserver/Makefile.inc b/sapi/aolserver/Makefile.inc
index 6c56958bc8..b96cdababf 100644
--- a/sapi/aolserver/Makefile.inc
+++ b/sapi/aolserver/Makefile.inc
@@ -2,5 +2,5 @@
 
 INSTALL_IT=:
 
-php4_nsapi.so: libmodphp4-so.a
+php4_nsapi.so: all-recursive
 	g++ $(LDFLAGS) -shared sapi/nsapi/aolserver.o -o $@ libmodphp4-so.a $(LIBS)
diff --git a/sapi/nsapi/Makefile.inc b/sapi/nsapi/Makefile.inc
index 6c56958bc8..b96cdababf 100644
--- a/sapi/nsapi/Makefile.inc
+++ b/sapi/nsapi/Makefile.inc
@@ -2,5 +2,5 @@
 
 INSTALL_IT=:
 
-php4_nsapi.so: libmodphp4-so.a
+php4_nsapi.so: all-recursive
 	g++ $(LDFLAGS) -shared sapi/nsapi/aolserver.o -o $@ libmodphp4-so.a $(LIBS)