debian_quirks

Gbp-Pq: Name 0002-debian_quirks.patch

diff --git a/configure.ac b/configure.ac
index 8b42844fc0fdd7076ccbc44ba4877246ff9ca0ab..b3572d21abf24e64deaa572a276c4aa55c6523a3 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1130,7 +1130,7 @@ AS_VAR_IF([PHP_CLI], [no], [with_pear=no])
 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])
 
@@ -1158,6 +1158,8 @@ AS_VAR_IF([PHP_PEAR], [no],, [
     [pear])
 ])
 
+PEAR_INSTALLDIR=/usr/share/php
+
 dnl Configuring Zend and TSRM.
 dnl ----------------------------------------------------------------------------
 
@@ -1323,6 +1325,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)
+
 AC_ARG_VAR([EXTENSION_DIR],
   [Default directory for dynamically loadable PHP extensions. If left empty, it
   is determined automatically. Can be overridden using the PHP 'extension_dir'

diff --git a/php.ini-development b/php.ini-development
index 6e5064dd447510710584506874e7f1f31f366810..d912779e8a3932a0195e8f4d1037796afe194161 100644 (file)
--- a/php.ini-development
+++ b/php.ini-development
@@ -736,7 +736,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 c62faf52b6732867aee52a634ae420266a3ac4d2..cb3363b68fa5e737dcc2294ccf46f305cbdc6be4 100644 (file)
--- a/php.ini-production
+++ b/php.ini-production
@@ -738,7 +738,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 e8ac382402d237f6216aa37f27d1665fe34a7efa..acd292c9a8ee9a2574e44318e80f22fd4d0afac1 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 cf56852c2b11330e410bb4d58cc5f9b8228d4ed4..82aa6417498f9be231f8f0fdc463d3f4da36d5d3 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 87c20089bb7f56f205984ab39b87cbc1dd6042f4..59a6b1467ff73f42711725681168f2719eb74b14 100644 (file)
--- a/scripts/php-config.in
+++ b/scripts/php-config.in
@@ -6,10 +6,10 @@ datarootdir="@datarootdir@"
 exec_prefix="@exec_prefix@"
 version="@PHP_VERSION@"
 vernum="@PHP_VERSION_ID@"
-include_dir="@includedir@/php"
+include_dir="@includedir@/php/@DEBIAN_PHP_API@"
 lib_dir="@orig_libdir@"
-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@"
+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@"
 man_dir=`eval echo @mandir@`

diff --git a/scripts/phpize.in b/scripts/phpize.in
index 2f117656f8d2b29e6e55f9bef395ae7bf50f79ef..30080efdd4ea8041905fafe05d5a9fedfd99ee5c 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@"