diff options
| -rw-r--r-- | configure.in | 4 | ||||
| -rw-r--r-- | sapi/cgi/config9.m4 | 2 | ||||
| -rw-r--r-- | sapi/cli/config.m4 | 2 | ||||
| -rw-r--r-- | scripts/Makefile.frag | 8 |
4 files changed, 10 insertions, 6 deletions
diff --git a/configure.in b/configure.in index 9a6791a27d..0f386a4add 100644 --- a/configure.in +++ b/configure.in @@ -911,6 +911,8 @@ unset LIBS LDFLAGS test "$prefix" = "NONE" && prefix=/usr/local test "$exec_prefix" = "NONE" && exec_prefix='${prefix}' +test "$program_prefix" = "NONE" && program_prefix= +test "$program_suffix" = "NONE" && program_suffix= case $libdir in '${exec_prefix}/lib') @@ -1036,6 +1038,8 @@ PHP_SUBST_OLD(php_abs_top_srcdir) PHP_SUBST(bindir) PHP_SUBST(exec_prefix) +PHP_SUBST(program_prefix) +PHP_SUBST(program_suffix) PHP_SUBST(includedir) PHP_SUBST(libdir) PHP_SUBST(mandir) diff --git a/sapi/cgi/config9.m4 b/sapi/cgi/config9.m4 index a16b6ab8a4..402cb0b90c 100644 --- a/sapi/cgi/config9.m4 +++ b/sapi/cgi/config9.m4 @@ -148,7 +148,7 @@ if test "$PHP_SAPI" = "default"; then AC_DEFINE_UNQUOTED(PHP_FCGI_STATIC, $PHP_FCGI_STATIC, [ ]) AC_MSG_RESULT($PHP_ENABLE_FASTCGI) - INSTALL_IT="@echo \"Installing PHP CGI into: \$(INSTALL_ROOT)\$(bindir)/\"; \$(INSTALL) -m 0755 \$(SAPI_CGI_PATH) \$(INSTALL_ROOT)\$(bindir)/php" + INSTALL_IT="@echo \"Installing PHP CGI into: \$(INSTALL_ROOT)\$(bindir)/\"; \$(INSTALL) -m 0755 \$(SAPI_CGI_PATH) \$(INSTALL_ROOT)\$(bindir)/\$(program_prefix)php\$(program_suffix)" PHP_SELECT_SAPI(cgi, program, $PHP_FCGI_FILES cgi_main.c getopt.c, $PHP_FCGI_INCLUDE, '$(SAPI_CGI_PATH)') case $host_alias in diff --git a/sapi/cli/config.m4 b/sapi/cli/config.m4 index b40ae70057..ffc3222515 100644 --- a/sapi/cli/config.m4 +++ b/sapi/cli/config.m4 @@ -30,7 +30,7 @@ if test "$PHP_SAPI_CLI" != "no"; then BUILD_CLI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)" ;; esac - INSTALL_CLI="\$(mkinstalldirs) \$(INSTALL_ROOT)\$(bindir); \$(INSTALL) -m 0755 \$(SAPI_CLI_PATH) \$(INSTALL_ROOT)\$(bindir)/php" + INSTALL_CLI="\$(mkinstalldirs) \$(INSTALL_ROOT)\$(bindir); \$(INSTALL) -m 0755 \$(SAPI_CLI_PATH) \$(INSTALL_ROOT)\$(bindir)/\$(program_prefix)php\$(program_suffix)" PHP_SUBST(BUILD_CLI) PHP_SUBST(INSTALL_CLI) diff --git a/scripts/Makefile.frag b/scripts/Makefile.frag index 09e176d581..6e0a26c38a 100644 --- a/scripts/Makefile.frag +++ b/scripts/Makefile.frag @@ -58,12 +58,12 @@ install-headers: install-programs: $(builddir)/phpize $(builddir)/php-config @echo "Installing helper programs: $(INSTALL_ROOT)$(bindir)/" @for prog in $(bin_SCRIPTS); do \ - echo " program: $$prog"; \ - $(INSTALL) -m 755 $(builddir)/$$prog $(INSTALL_ROOT)$(bindir)/$$prog; \ + echo " program: $(program_prefix)$$prog$(program_suffix)"; \ + $(INSTALL) -m 755 $(builddir)/$$prog $(INSTALL_ROOT)$(bindir)/$(program_prefix)$$prog$(program_suffix); \ done @for prog in $(bin_src_SCRIPTS); do \ - echo " program: $$prog"; \ - $(INSTALL) -m 755 $(top_srcdir)/scripts/$$prog $(INSTALL_ROOT)$(bindir)/$$prog; \ + echo " program: $(program_prefix)$$prog$(program_suffix)"; \ + $(INSTALL) -m 755 $(top_srcdir)/scripts/$$prog $(INSTALL_ROOT)$(bindir)/$(program_prefix)$$prog$(program_suffix); \ done $(builddir)/phpize: $(srcdir)/phpize.in $(top_builddir)/config.status |