- MFH: We need to install these headers too

diff --git a/ext/iconv/php_iconv.h b/ext/iconv/php_iconv.h
index b162dfa70f0948281e43fbf6b68d5108cea76797..0d7f6e58caa9f1e88aeaef8c4f8ef466df55b2af 100644 (file)
--- a/ext/iconv/php_iconv.h
+++ b/ext/iconv/php_iconv.h
@@ -33,13 +33,13 @@
 #endif
 
 #ifdef PHP_ATOM_INC
-#include "php_have_iconv.h"
-#include "php_have_libiconv.h"
-#include "php_have_glibc_iconv.h"
-#include "php_have_bsd_iconv.h"
-#include "php_iconv_supports_errno.h"
-#include "php_php_iconv_impl.h"
-#include "php_php_iconv_h_path.h"
+#include "include/php_have_iconv.h"
+#include "include/php_have_libiconv.h"
+#include "include/php_have_glibc_iconv.h"
+#include "include/php_have_bsd_iconv.h"
+#include "include/php_iconv_supports_errno.h"
+#include "include/php_php_iconv_impl.h"
+#include "include/php_php_iconv_h_path.h"
 #endif
 
 

diff --git a/scripts/Makefile.frag b/scripts/Makefile.frag
index 7c40b41b5ca70775077ab1e5a4cbae73117c7192..d7519008c6503f9437cb77a3bdc3572d3a9d9cf3 100644 (file)
--- a/scripts/Makefile.frag
+++ b/scripts/Makefile.frag
@@ -26,9 +26,11 @@ HEADER_DIRS = \
        / \
        Zend/ \
        TSRM/ \
+       include/ \
        main/ \
        main/streams/ \
        regex/ \
+       ext/iconv/ \
        ext/libxml/ \
        ext/standard/ \
        ext/session/ \