debian_quirks

Gbp-Pq: Name 0002-debian_quirks.patch

diff --git a/configure.ac b/configure.ac
index 780f3c4bd7519db853187a3f099faf3b85883797..4f704cb6675713f54fbf7cf427f1f8488007e14c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1204,7 +1204,7 @@ fi
 PHP_ARG_WITH([pear],
   [whether to install PEAR],
   [AS_HELP_STRING([[--with-pear[=DIR]]],
-    [Install PEAR in DIR [PREFIX/lib/php]])],
+    [Install PEAR in DIR [PREFIX/share/php]])],
   [no],
   [yes])
 
@@ -1235,6 +1235,8 @@ if test "$PHP_PEAR" != "no"; then
   PHP_ADD_MAKEFILE_FRAGMENT($abs_srcdir/pear/Makefile.frag,$abs_srcdir/pear,pear)
 fi
 
+PEAR_INSTALLDIR=/usr/share/php
+
 dnl Configuring Zend and TSRM.
 dnl ----------------------------------------------------------------------------
 
@@ -1376,6 +1378,8 @@ datadir=`eval eval echo $datadir`
 dnl Build extension directory path.
 ZEND_MODULE_API_NO=`$EGREP '#define ZEND_MODULE_API_NO ' $srcdir/Zend/zend_modules.h|"${SED}" 's/#define ZEND_MODULE_API_NO //'`
 
+AC_SUBST(ZEND_MODULE_API_NO)
+
 if test -z "$EXTENSION_DIR"; then
   extbasedir=$ZEND_MODULE_API_NO
   if test "$oldstyleextdir" = "yes"; then

diff --git a/php.ini-development b/php.ini-development
index 61cd33e89504c8b0349f278c34bee1d91377dd1f..97592d3596ade0ad790aed05827163471a1b4af9 100644 (file)
--- a/php.ini-development
+++ b/php.ini-development
@@ -740,7 +740,7 @@ default_charset = "UTF-8"
 ;;;;;;;;;;;;;;;;;;;;;;;;;
 
 ; UNIX: "/path1:/path2"
-;include_path = ".:/php/includes"
+;include_path = ".:/usr/share/php"
 ;
 ; Windows: "\path1;\path2"
 ;include_path = ".;c:\php\includes"

diff --git a/php.ini-production b/php.ini-production
index 2189660c02c4820d77456236e9f2d3536484d8ff..d920565c34dd36a3f0364e843a5a5f63c3a98bf0 100644 (file)
--- a/php.ini-production
+++ b/php.ini-production
@@ -742,7 +742,7 @@ default_charset = "UTF-8"
 ;;;;;;;;;;;;;;;;;;;;;;;;;
 
 ; UNIX: "/path1:/path2"
-;include_path = ".:/php/includes"
+;include_path = ".:/usr/share/php"
 ;
 ; Windows: "\path1;\path2"
 ;include_path = ".;c:\php\includes"

diff --git a/sapi/cli/php.1.in b/sapi/cli/php.1.in
index a49e9cac13fb507d6e6bea93ea2a8f9f2966330d..32ca73d319741edf26f033bf87af695540616e0c 100644 (file)
--- a/sapi/cli/php.1.in
+++ b/sapi/cli/php.1.in
@@ -374,13 +374,14 @@ Shows configuration for extension
 Show configuration file names
 .SH FILES
 .TP 15
-.B php\-cli.ini
+.B /etc/php/@PHP_MAJOR_VERSION@.@PHP_MINOR_VERSION@/cli/php.ini
 The configuration file for the CLI version of PHP.
 .TP
-.B php.ini
-The standard configuration file will only be used when
-.B php\-cli.ini
-cannot be found.
++.B /etc/php/@PHP_MAJOR_VERSION@.@PHP_MINOR_VERSION@/cgi/php.ini
++The configuration file for the CGI version of PHP.
++.TP
++.B /etc/php/@PHP_MAJOR_VERSION@.@PHP_MINOR_VERSION@/apache2/php.ini
++The configuration file for the version of PHP that apache2 uses.
 .SH EXAMPLES
 .TP 5
 \fI@program_prefix@php \-r 'echo "Hello World\\n";'\fP

diff --git a/scripts/Makefile.frag b/scripts/Makefile.frag
index 104983214546ffe59d6e439f0f66a04ba8bb1531..e54326345dd6607537914adb05ba149af9337c88 100644 (file)
--- a/scripts/Makefile.frag
+++ b/scripts/Makefile.frag
@@ -2,8 +2,8 @@
 # Build environment install
 #
 
-phpincludedir = $(includedir)/php
-phpbuilddir = $(libdir)/build
+phpincludedir = $(includedir)/php/$(DEBIAN_PHP_API)
+phpbuilddir = $(prefix)/lib/php/$(DEBIAN_PHP_API)/build
 
 BUILD_FILES = \
        scripts/phpize.m4 \

diff --git a/scripts/php-config.in b/scripts/php-config.in
index 9271e8728636228934ee5bce0ad96355ea30bca3..355be04954915e58d0e1c36d89eb957b2f0b012c 100644 (file)
--- a/scripts/php-config.in
+++ b/scripts/php-config.in
@@ -6,11 +6,11 @@ datarootdir="@datarootdir@"
 exec_prefix="@exec_prefix@"
 version="@PHP_VERSION@"
 vernum="@PHP_VERSION_ID@"
-include_dir="@includedir@/php"
-includes="-I$include_dir -I$include_dir/main -I$include_dir/TSRM -I$include_dir/Zend -I$include_dir/ext -I$include_dir/ext/date/lib"
-ldflags="@PHP_LDFLAGS@"
+include_dir="@includedir@/php/@DEBIAN_PHP_API@"
+includes="-I$include_dir -I$include_dir/main -I$include_dir/TSRM -I$include_dir/Zend -I$include_dir/ext -I$include_dir/ext/date/lib $(getconf LFS_CFLAGS)"
+ldflags="-L$prefix/lib/php/@DEBIAN_PHP_API@ @PHP_LDFLAGS@"
 libs="@EXTRA_LIBS@"
-extension_dir='@EXTENSION_DIR@'
+extension_dir="@EXTENSION_DIR@"
 man_dir=`eval echo @mandir@`
 program_prefix="@program_prefix@"
 program_suffix="@program_suffix@"

diff --git a/scripts/phpize.in b/scripts/phpize.in
index 7d9c1df14c8ec08f9a07022471f49cfd6b06b5cd..0846bf2a71655192b3b7c3753a637ad9c85950ec 100644 (file)
--- a/scripts/phpize.in
+++ b/scripts/phpize.in
@@ -4,8 +4,8 @@
 prefix='@prefix@'
 datarootdir='@datarootdir@'
 exec_prefix="`eval echo @exec_prefix@`"
-phpdir="`eval echo @libdir@`/build"
-includedir="`eval echo @includedir@`/php"
+phpdir="$prefix/lib/php/@DEBIAN_PHP_API@/build"
+includedir="$prefix/include/php/@DEBIAN_PHP_API@"
 builddir="`pwd`"
 SED="@SED@"