Magellan Linux

Contents of /trunk/php5/patches/php5-5.2.4-build-dir.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 346 - (show annotations) (download)
Fri Sep 7 18:36:03 2007 UTC (17 years, 1 month ago) by niro
File size: 1913 byte(s)
-rediffed against php-5.2.4

1 diff -Naur php-5.2.4/configure.in php-5.2.4-magellan/configure.in
2 --- php-5.2.4/configure.in 2007-08-30 01:36:11.000000000 +0200
3 +++ php-5.2.4-magellan/configure.in 2007-09-07 20:34:03.000000000 +0200
4 @@ -1023,7 +1023,7 @@
5
6 case $libdir in
7 '${exec_prefix}/lib')
8 - libdir=$libdir/php
9 + libdir=$libdir/php5
10 ;;
11 esac
12 case $datadir in
13 diff -Naur php-5.2.4/scripts/Makefile.frag php-5.2.4-magellan/scripts/Makefile.frag
14 --- php-5.2.4/scripts/Makefile.frag 2005-11-22 00:08:02.000000000 +0100
15 +++ php-5.2.4-magellan/scripts/Makefile.frag 2007-09-07 20:34:53.000000000 +0200
16 @@ -3,8 +3,8 @@
17 # Build environment install
18 #
19
20 -phpincludedir = $(includedir)/php
21 -phpbuilddir = $(libdir)/build
22 +phpincludedir = $(includedir)/php5
23 +phpbuilddir = $(libdir)/php5/build
24
25 BUILD_FILES = \
26 scripts/phpize.m4 \
27 diff -Naur php-5.2.4/scripts/php-config.in php-5.2.4-magellan/scripts/php-config.in
28 --- php-5.2.4/scripts/php-config.in 2007-08-24 13:44:10.000000000 +0200
29 +++ php-5.2.4-magellan/scripts/php-config.in 2007-09-07 20:35:12.000000000 +0200
30 @@ -5,7 +5,7 @@
31 exec_prefix="@exec_prefix@"
32 version="@PHP_VERSION@"
33 vernum="@PHP_VERSION_ID@"
34 -include_dir="@includedir@/php"
35 +include_dir="@includedir@/php5"
36 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"
37 ldflags="@PHP_LDFLAGS@"
38 libs="@EXTRA_LIBS@"
39 diff -Naur php-5.2.4/scripts/phpize.in php-5.2.4-magellan/scripts/phpize.in
40 --- php-5.2.4/scripts/phpize.in 2007-06-29 03:10:35.000000000 +0200
41 +++ php-5.2.4-magellan/scripts/phpize.in 2007-09-07 20:35:49.000000000 +0200
42 @@ -3,8 +3,8 @@
43 # Variable declaration
44 prefix='@prefix@'
45 exec_prefix="`eval echo @exec_prefix@`"
46 -phpdir="`eval echo @libdir@`/build"
47 -includedir="`eval echo @includedir@`/php"
48 +phpdir="`eval echo @libdir@`/php5/build"
49 +includedir="`eval echo @includedir@`/php5"
50 builddir="`pwd`"
51 SED="@SED@"
52