Browse files

Fix install-sapi dependency - it should depend on OVERALL_TARGET, of …

…course.
  • Loading branch information...
1 parent 6084487 commit 1b50ca4df67b0a274cbc92dfeaad647343fb06bd Sascha Schumann committed Jul 2, 2003
Showing with 7 additions and 24 deletions.
  1. +2 −2 Makefile.global
  2. +4 −16 configure.in
  3. +0 −4 sapi/cgi/Makefile.frag
  4. +1 −2 sapi/cgi/config9.m4
View
4 Makefile.global
@@ -16,15 +16,15 @@ build-modules: $(PHP_MODULES)
libphp5.la: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS)
$(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@
+ -@$(LIBTOOL) --silent --mode=install cp libphp5.la $(phptempdir)/libphp5.la >/dev/null 2>&1
libs/libphp5.bundle: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS)
$(CC) $(MH_BUNDLE_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) $(EXTRA_LDFLAGS) $(PHP_GLOBAL_OBJS:.lo=.o) $(PHP_SAPI_OBJS:.lo=.o) $(PHP_FRAMEWORKS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@ && cp $@ libs/libphp5.so
install: $(all_targets) $(install_targets)
-install-sapi: libphp5.la
+install-sapi: $(OVERALL_TARGET)
@echo "Installing PHP SAPI module"
- -@$(LIBTOOL) --silent --mode=install cp libphp5.la $(phptempdir)/libphp5.la >/dev/null 2>&1
-@$(mkinstalldirs) $(INSTALL_ROOT)$(bindir)
-@if test ! -r $(phptempdir)/libphp5.$(SHLIB_SUFFIX_NAME); then \
for i in 0.0.0 0.0 0; do \
View
20 configure.in
@@ -1125,22 +1125,10 @@ INLINE_CFLAGS="$INLINE_CFLAGS $standard_libtool_flag"
CXXFLAGS="$CXXFLAGS $standard_libtool_flag"
all_targets='$(OVERALL_TARGET) $(PHP_MODULES) $(PHP_CLI_TARGET)'
-install_targets="install-modules $install_pear install-build install-headers install-programs"
-
-case $PHP_SAPI in
- cgi)
- dnl Install CGI only (CLI is not installed even if it's enabled)
- install_targets="install-cgi $install_targets"
- ;;
- cli)
- dnl Install CLI only (--disable-cgi used, no other SAPIs enabled)
- install_targets="install-cli $install_targets"
- ;;
- *)
- dnl Install CLI and another SAPI
- install_targets="$PHP_INSTALL_CLI_TARGET install-sapi $install_targets"
- ;;
-esac
+install_targets="install-sapi install-modules $install_pear install-build install-headers install-programs"
+if test "$PHP_SAPI" != "cgi"; then
+ install_targets="$PHP_INSTALL_CLI_TARGET $install_targets"
+fi
PHP_SUBST(all_targets)
PHP_SUBST(install_targets)
View
4 sapi/cgi/Makefile.frag
@@ -1,6 +1,2 @@
$(SAPI_CGI_PATH): $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS)
$(BUILD_CGI)
-
-install-cgi: $(SAPI_CGI_PATH)
- @echo "Installing PHP CGI binary: $(INSTALL_ROOT)$(bindir)/"
- @$(INSTALL_CGI)
View
3 sapi/cgi/config9.m4
@@ -147,6 +147,7 @@ if test "$PHP_SAPI" = "default"; then
AC_DEFINE_UNQUOTED(PHP_FCGI_STATIC, $PHP_FCGI_STATIC, [ ])
AC_MSG_RESULT($PHP_ENABLE_FASTCGI)
+ INSTALL_IT="\$(INSTALL) -m 0755 \$(SAPI_CGI_PATH) \$(INSTALL_ROOT)\$(bindir)/php"
PHP_SELECT_SAPI(cgi, program, $PHP_FCGI_FILES cgi_main.c getopt.c, $PHP_FCGI_INCLUDE, '$(SAPI_CGI_PATH)')
case $host_alias in
@@ -157,10 +158,8 @@ if test "$PHP_SAPI" = "default"; then
BUILD_CGI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_SAPI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)"
;;
esac
- INSTALL_CGI="\$(mkinstalldirs) \$(INSTALL_ROOT)\$(bindir); \$(INSTALL) -m 0755 \$(SAPI_CGI_PATH) \$(INSTALL_ROOT)\$(bindir)/php"
PHP_SUBST(BUILD_CGI)
- PHP_SUBST(INSTALL_CGI)
elif test "$PHP_SAPI_CLI" != "no"; then
AC_MSG_RESULT(no)

0 comments on commit 1b50ca4

Please sign in to comment.