summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorfoobar <sniper@php.net>2005-05-07 02:51:53 +0000
committerfoobar <sniper@php.net>2005-05-07 02:51:53 +0000
commit626253940ea0c246984e277b6786b4950b69e3cc (patch)
treeb5cc4006315847c774ea646c8839b4a2531cc823 /scripts
parentdeacfcefc2cce245ef08ef949a21aa2bb0f32fd0 (diff)
downloadphp-git-626253940ea0c246984e277b6786b4950b69e3cc.tar.gz
- Added PHP_INSTALL_HEADERS() macro
- Fixed several VPATH build issues - Changed all awk calls to use $AWK - Changed all mkdir calls to use "$php_shtool mkdir"
Diffstat (limited to 'scripts')
-rw-r--r--scripts/Makefile.frag22
-rw-r--r--scripts/phpize.m48
2 files changed, 7 insertions, 23 deletions
diff --git a/scripts/Makefile.frag b/scripts/Makefile.frag
index 3d476a7608..8dd1d101c4 100644
--- a/scripts/Makefile.frag
+++ b/scripts/Makefile.frag
@@ -31,32 +31,14 @@ install-build:
$(INSTALL) $(BUILD_FILES_EXEC) $(INSTALL_ROOT)$(phpbuilddir) && \
$(INSTALL_DATA) $(BUILD_FILES) $(INSTALL_ROOT)$(phpbuilddir))
-HEADER_DIRS = \
- Zend/ \
- TSRM/ \
- include/ \
- main/ \
- main/streams/ \
- regex/ \
- ext/iconv/ \
- ext/libxml/ \
- ext/standard/ \
- ext/session/ \
- ext/dom/xml_common.h \
- ext/xml/ \
- ext/mbstring/ \
- ext/mbstring/libmbfl/ \
- ext/mbstring/libmbfl/mbfl/ \
- ext/sqlite/libsqlite/src/sqlite.h
-
install-headers:
- -@for i in $(HEADER_DIRS); do \
+ -@for i in $(INSTALL_HEADERS); do \
i=`$(top_srcdir)/build/shtool path -d $$i`; \
paths="$$paths $(INSTALL_ROOT)$(phpincludedir)/$$i"; \
done; \
$(mkinstalldirs) $$paths && \
echo "Installing header files: $(INSTALL_ROOT)$(phpincludedir)/" && \
- for i in $(HEADER_DIRS); do \
+ for i in $(INSTALL_HEADERS); do \
if test -f "$(top_srcdir)/$$i"; then \
$(INSTALL_DATA) $(top_srcdir)/$$i $(INSTALL_ROOT)$(phpincludedir)/$$i; \
elif test -f "$(top_builddir)/$$i"; then \
diff --git a/scripts/phpize.m4 b/scripts/phpize.m4
index afb555d9c1..5b056f5709 100644
--- a/scripts/phpize.m4
+++ b/scripts/phpize.m4
@@ -2,8 +2,6 @@ dnl This file becomes configure.in for self-contained extensions.
AC_INIT(config.m4)
-PHP_INIT_BUILD_SYSTEM
-
AC_DEFUN([PHP_WITH_PHP_CONFIG],[
AC_ARG_WITH(php-config,
[ --with-php-config=PATH],[
@@ -19,6 +17,10 @@ AC_DEFUN([PHP_WITH_PHP_CONFIG],[
if test -z "$prefix"; then
AC_MSG_ERROR(Cannot find php-config. Please use --with-php-config=PATH)
fi
+
+ php_shtool=$srcdir/build/shtool
+ PHP_INIT_BUILD_SYSTEM
+
AC_MSG_CHECKING(for PHP prefix)
AC_MSG_RESULT($prefix)
AC_MSG_CHECKING(for PHP includes)
@@ -106,7 +108,7 @@ PHP_SUBST(SHELL)
PHP_GEN_BUILD_DIRS
PHP_GEN_GLOBAL_MAKEFILE
-test -d modules || mkdir modules
+test -d modules || $php_shtool mkdir modules
touch .deps
AC_CONFIG_HEADER(config.h)