1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143
|
From: Debian PHP Maintainers <pkg-php-maint@lists.alioth.debian.org>
Date: Sat, 2 May 2015 10:26:51 +0200
Subject: debian_quirks
---
configure.ac | 6 +++++-
php.ini-development | 2 +-
php.ini-production | 2 +-
sapi/cli/php.1.in | 11 ++++++-----
scripts/Makefile.frag | 4 ++--
scripts/php-config.in | 6 +++---
scripts/phpize.in | 4 ++--
7 files changed, 20 insertions(+), 15 deletions(-)
diff --git a/configure.ac b/configure.ac
index 8b42844..b3572d2 100644
--- 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 6e5064d..d912779 100644
--- 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 c62faf5..cb3363b 100644
--- 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 e8ac382..acd292c 100644
--- 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 cf56852..82aa641 100644
--- 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 87c2008..59a6b14 100644
--- 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 2f11765..30080ef 100644
--- 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@"
|