diff options
| author | Sascha Schumann <sas@php.net> | 2003-07-02 01:08:26 +0000 |
|---|---|---|
| committer | Sascha Schumann <sas@php.net> | 2003-07-02 01:08:26 +0000 |
| commit | 1b50ca4df67b0a274cbc92dfeaad647343fb06bd (patch) | |
| tree | 07ebc20d51b0ed5d9942a6224bd5fde8914bf465 /sapi | |
| parent | 60844878224a4627cc04ea2c08672adb3d441971 (diff) | |
| download | php-git-1b50ca4df67b0a274cbc92dfeaad647343fb06bd.tar.gz | |
Fix install-sapi dependency - it should depend on OVERALL_TARGET, of course.
Diffstat (limited to 'sapi')
| -rw-r--r-- | sapi/cgi/Makefile.frag | 4 | ||||
| -rw-r--r-- | sapi/cgi/config9.m4 | 3 |
2 files changed, 1 insertions, 6 deletions
diff --git a/sapi/cgi/Makefile.frag b/sapi/cgi/Makefile.frag index 02398ae8b3..57a3b2937c 100644 --- a/sapi/cgi/Makefile.frag +++ b/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) diff --git a/sapi/cgi/config9.m4 b/sapi/cgi/config9.m4 index f594e7035b..c6c5e665dd 100644 --- a/sapi/cgi/config9.m4 +++ b/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) |