Copy header files from main and also add that directory to the list

of include directories.

diff --git a/pear/Makefile.in b/pear/Makefile.in
index 18594eb7e996c21f714a690f82f7bcd2442c5f47..c4e92fe28573d761f4659d6c6aa8185448a6c89e 100644 (file)
--- a/pear/Makefile.in
+++ b/pear/Makefile.in
@@ -74,6 +74,7 @@ HEADER_DIRS = \
        Zend \
        TSRM \
        ext/standard \
+       main \
        regex
 
 install-headers:

diff --git a/pear/php-config.in b/pear/php-config.in
index cdd375b2dcb650ac1397d98a4f9aca4b8a7dc51b..4649251e12fd836c2d766b7e2af2724af5b2e782 100644 (file)
--- a/pear/php-config.in
+++ b/pear/php-config.in
@@ -1,7 +1,7 @@
 #! /bin/sh
 
 prefix='@PREFIX@'
-includes='-I@PHPINCLUDEDIR@ -I@PHPINCLUDEDIR@/Zend -I@PHPINCLUDEDIR@/TSRM'
+includes='-I@PHPINCLUDEDIR@ -I@PHPINCLUDEDIR@/main -I@PHPINCLUDEDIR@/Zend -I@PHPINCLUDEDIR@/TSRM'
 extension_dir='@EXTENSION_DIR@'
 
 case "$1" in