sniper Mon Dec 1 10:17:15 2003 EDT
Modified files:
/php-src configure.in
/php-src/sapi/cgi config9.m4
/php-src/sapi/cli config.m4
/php-src/scripts Makefile.frag
Log:
- Made --program-prefix and --program-suffix work. (See bug #23030)
Index: php-src/configure.in
diff -u php-src/configure.in:1.478 php-src/configure.in:1.479
--- php-src/configure.in:1.478 Sat Nov 29 08:33:33 2003
+++ php-src/configure.in Mon Dec 1 10:17:06 2003
@@ -1,4 +1,4 @@
-dnl ## $Id: configure.in,v 1.478 2003/11/29 13:33:33 sniper Exp $ -*- sh -*-
+dnl ## $Id: configure.in,v 1.479 2003/12/01 15:17:06 sniper Exp $ -*- sh -*-
dnl ## Process this file with autoconf to produce a configure script.
divert(1)
@@ -911,6 +911,8 @@
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(bindir)
PHP_SUBST(exec_prefix)
+PHP_SUBST(program_prefix)
+PHP_SUBST(program_suffix)
PHP_SUBST(includedir)
PHP_SUBST(libdir)
PHP_SUBST(mandir)
Index: php-src/sapi/cgi/config9.m4
diff -u php-src/sapi/cgi/config9.m4:1.11 php-src/sapi/cgi/config9.m4:1.12
--- php-src/sapi/cgi/config9.m4:1.11 Fri Oct 3 01:24:29 2003
+++ php-src/sapi/cgi/config9.m4 Mon Dec 1 10:17:08 2003
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config9.m4,v 1.11 2003/10/03 05:24:29 sniper Exp $
+dnl $Id: config9.m4,v 1.12 2003/12/01 15:17:08 sniper Exp $
dnl
AC_ARG_ENABLE(cgi,
@@ -148,7 +148,7 @@
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
Index: php-src/sapi/cli/config.m4
diff -u php-src/sapi/cli/config.m4:1.17 php-src/sapi/cli/config.m4:1.18
--- php-src/sapi/cli/config.m4:1.17 Mon Sep 8 09:10:09 2003
+++ php-src/sapi/cli/config.m4 Mon Dec 1 10:17:10 2003
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.17 2003/09/08 13:10:09 sniper Exp $
+dnl $Id: config.m4,v 1.18 2003/12/01 15:17:10 sniper Exp $
dnl
AC_MSG_CHECKING(for CLI build)
@@ -30,7 +30,7 @@
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)
Index: php-src/scripts/Makefile.frag
diff -u php-src/scripts/Makefile.frag:1.8 php-src/scripts/Makefile.frag:1.9
--- php-src/scripts/Makefile.frag:1.8 Fri Sep 19 01:35:50 2003
+++ php-src/scripts/Makefile.frag Mon Dec 1 10:17:13 2003
@@ -58,12 +58,12 @@
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
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
