This should fix cli build when running 'make install' directly.

diff --git a/Makefile.in b/Makefile.in
index f19c23f79a311b32c64e4bac132ac3f08d7a3e95..749a522c3400c5b544c08df63f164f246bcbc884 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,6 +1,6 @@
 
 ZEND_DIR = $(srcdir)/Zend
-SUBDIRS = Zend main ext sapi $(TSRM_DIR) $(REGEX_DIR) . sapi/cli $(PEAR_DIR)
+SUBDIRS = Zend main ext sapi $(TSRM_DIR) $(REGEX_DIR) sapi/cli . $(PEAR_DIR)
 
 LTLIBRARY_NAME = libphp4.la
 LTLIBRARY_SOURCES = stub.c

diff --git a/sapi/cli/Makefile.in b/sapi/cli/Makefile.in
index e661570f59a9ae56209b56dc4055f513f212e62c..90f0e0d63a57f7d27514d9e337fdac74cbbc94b1 100644 (file)
--- a/sapi/cli/Makefile.in
+++ b/sapi/cli/Makefile.in
@@ -1,5 +1,5 @@
 LTLIBRARY_NAME = libphp4cli.la
-LTLIBRARY_SOURCES = $(top_srcdir)/stub.c php_cli.c getopt.c
+LTLIBRARY_SOURCES = php_cli.c getopt.c
 
 LTLIBRARY_DEPENDENCIES = \
                $(top_srcdir)/Zend/libZend.la \
@@ -13,7 +13,7 @@ LTLIBRARY_LIBADD = $(LTLIBRARY_DEPENDENCIES) $(EXTRA_LIBS)
 
 
 PROGRAM_NAME         = php
-PROGRAM_SOURCES      = $(top_srcdir)/stub.c
+PROGRAM_SOURCES      = 
 PROGRAM_LDADD        = libphp4cli.la $(EXT_PROGRAM_LDADD)
 PROGRAM_LDFLAGS      = -export-dynamic
 PROGRAM_DEPENDENCIES = $(PROGRAM_LDADD)