* include from $(srcdir)

    * use proper target for nsapi

diff --git a/Makefile.in b/Makefile.in
index 992bf7ad3fbf08ed058967cab449dfba492c960c..fdbbe5677dbc2bc09b49a15d1cd9f46715bbf1cd 100644 (file)
--- 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 6c56958bc8a7147369ce1ab8caefd23aed210405..b96cdababf01814d093b3edc077dcbfc5ff6e302 100644 (file)
--- 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 6c56958bc8a7147369ce1ab8caefd23aed210405..b96cdababf01814d093b3edc077dcbfc5ff6e302 100644 (file)
--- 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)