- MFB: do not export the api or install the headers

diff --git a/ext/zip/Makefile.frag b/ext/zip/Makefile.frag
deleted file mode 100644 (file)
index b3781e3..0000000
--- a/ext/zip/Makefile.frag
+++ /dev/null
@@ -1,28 +0,0 @@
-phpincludedir=$(prefix)/include/php
-
-ZIP_HEADER_FILES= \
-       zip.h \
-       zipint.h \
-       zip_alias.h \
-       zipint_alias.h
-
-install-zip-headers:
-       @echo "Installing ZIP headers:          $(INSTALL_ROOT)$(phpincludedir)/ext/zip/lib"
-       @$(mkinstalldirs) $(INSTALL_ROOT)$(phpincludedir)/ext/zip/lib
-       @for f in $(ZIP_HEADER_FILES); do \
-               if test -f "$(top_srcdir)/lib/$$f"; then \
-                       $(INSTALL_DATA) $(top_srcdir)/lib/$$f $(INSTALL_ROOT)$(phpincludedir)/ext/zip/lib; \
-               elif test -f "$(top_builddir)/lib/$$f"; then \
-                       $(INSTALL_DATA) $(top_builddir)/lib/$$f $(INSTALL_ROOT)$(phpincludedir)/ext/zip/lib; \
-               elif test -f "$(top_srcdir)/ext/zip/lib/$$f"; then \
-                       $(INSTALL_DATA) $(top_srcdir)/ext/zip/lib/$$f $(INSTALL_ROOT)$(phpincludedir)/ext/zip/lib; \
-               elif test -f "$(top_builddir)/ext/zip/lib/$$f"; then \
-                       $(INSTALL_DATA) $(top_builddir)/ext/zip/lib/$$f $(INSTALL_ROOT)$(phpincludedir)/ext/zip/lib; \
-               else \
-                       echo "hmmm"; \
-               fi \
-       done;
-
-# mini hack
-install: $(all_targets) $(install_targets) install-zip-headers
-

diff --git a/ext/zip/config.m4 b/ext/zip/config.m4
index 271bd2faa056ceea4d21e956255b97722503b2ee..c5edaa725e29b2ced5deddbc8ce8a6624152aec5 100644 (file)
--- a/ext/zip/config.m4
+++ b/ext/zip/config.m4
@@ -66,12 +66,4 @@ if test "$PHP_ZIP" != "no"; then
        PHP_NEW_EXTENSION(zip, php_zip.c zip_stream.c $PHP_ZIP_SOURCES, $ext_shared)
        PHP_ADD_BUILD_DIR($ext_builddir/lib, 1)
        PHP_SUBST(ZIP_SHARED_LIBADD)
-       ifdef([PHP_INSTALL_HEADERS],
-       [
-         dnl Sadly, this is a complete NOP for pecl extensions
-         PHP_INSTALL_HEADERS(ext/zip/lib, [lib/zip.h lib/zipint.h lib/zip_alias.h lib/zipint_alias.h])
-       ])
-       
-       dnl so we always include the known-good working hack.
-       PHP_ADD_MAKEFILE_FRAGMENT
 fi