-fix installation through pear

diff --git a/config.m4 b/config.m4
index 15d958c931198d587dd3cde9002e23602ac6f7fa..85b6de34c7ee20787c680bcaea17179af02b5f0f 100644 (file)
--- a/config.m4
+++ b/config.m4
@@ -77,6 +77,7 @@ dnl ----
                http_api.c http_auth_api.c http_cache_api.c http_request_api.c http_date_api.c \
                http_headers_api.c http_message_api.c http_send_api.c http_url_api.c"
        PHP_NEW_EXTENSION([http], $PHP_HTTP_SOURCES, [$ext_shared])
                http_api.c http_auth_api.c http_cache_api.c http_request_api.c http_date_api.c \
                http_headers_api.c http_message_api.c http_send_api.c http_url_api.c"
        PHP_NEW_EXTENSION([http], $PHP_HTTP_SOURCES, [$ext_shared])

+       PHP_ADD_BUILD_DIR($ext_builddir/phpstr, 1)

        PHP_SUBST([HTTP_SHARED_LIBADD])
        PHP_ADD_MAKEFILE_FRAGMENT
        AC_DEFINE([HAVE_HTTP], [1], [Have extended HTTP support])
        PHP_SUBST([HTTP_SHARED_LIBADD])
        PHP_ADD_MAKEFILE_FRAGMENT
        AC_DEFINE([HAVE_HTTP], [1], [Have extended HTTP support])

diff --git a/package.xml b/package.xml
index f238ee9e0cb0f7ec94c7b8f2df1d69c6420a647d..dd43914a23a00fa944de58f3457d30f4fbc48a11 100644 (file)
--- a/package.xml
+++ b/package.xml
@@ -46,15 +46,17 @@
     <dir name="/">
       <file role="doc">CREDITS</file>
       <file role="doc">EXPERIMENTAL</file>
     <dir name="/">
       <file role="doc">CREDITS</file>
       <file role="doc">EXPERIMENTAL</file>

-      <file role="doc">docs/functions.html</file>
+      <file role="doc" install-as="functions.html">docs/functions.html</file>

       <file role="doc">KnownIssues.txt</file>
       
       <file role="src" platform="windows">http.dsp</file>
       <file role="src" platform="windows">config.w32</file>
       <file role="src">config.m4</file>
       
       <file role="doc">KnownIssues.txt</file>
       
       <file role="src" platform="windows">http.dsp</file>
       <file role="src" platform="windows">config.w32</file>
       <file role="src">config.m4</file>
       

-      <file role="src">phpstr/phpstr.h</file>
-      <file role="src">phpstr/phpstr.c</file>
+      <dir name="phpstr">
+        <file role="src">phpstr.h</file>
+        <file role="src">phpstr.c</file>
+      </dir>

       
       <file role="src">missing.h</file>
       <file role="src">missing.c</file>
       
       <file role="src">missing.h</file>
       <file role="src">missing.c</file>


@@ -98,8 +100,8 @@
       <file role="src">http_exception_object.c</file>
       
       <dir name="tests" role="test">
       <file role="src">http_exception_object.c</file>
       
       <dir name="tests" role="test">

-        <file>README.txt</file>
-        <file>run-tests.diff</file>
+        <file install-as="README.txt">README.txt</file>
+        <file install-as="run-tests.diff">run-tests.diff</file>

         <file>data.txt</file>
         <file>skip.inc</file>
         <file>abs_uri_001.phpt</file>
         <file>data.txt</file>
         <file>skip.inc</file>
         <file>abs_uri_001.phpt</file>


@@ -143,8 +145,7 @@
     </dir>
   </filelist>
   <deps>
     </dir>
   </filelist>
   <deps>

-       <dep type="php" rel="ge" version="4.3.1" optional="no" />
-       <dep type="php" rel="ge" version="5.0.4" optional="yes" />
+       <dep type="php" rel="ge" version="4.3" optional="no" />

        <dep type="ext" rel="has" optional="yes">session</dep>
        <dep type="ext" rel="has" optional="yes">zlib</dep>
   </deps>
        <dep type="ext" rel="has" optional="yes">session</dep>
        <dep type="ext" rel="has" optional="yes">zlib</dep>
   </deps>