Magellan Linux

  • Back to homepage
    • /[pkg-src]/trunk/php5/patches/php5-5.2.3-build-dir2.patch

    Contents of /trunk/php5/patches/php5-5.2.3-build-dir2.patch

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 263 - (show annotations) (download)
    Wed Jul 11 00:35:15 2007 UTC (16 years, 10 months ago) by niro
    File size: 1960 byte(s) 
    -fixed libdir and include dir as well
    1 diff -Naur php-5.2.3/configure.in php-5.2.3-magellan/configure.in
    2 --- php-5.2.3/configure.in 2007-05-30 20:45:59.000000000 +0200
    3 +++ php-5.2.3-magellan/configure.in 2007-07-11 02:32:27.000000000 +0200
    4 @@ -1051,7 +1051,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.3/scripts/Makefile.frag php-5.2.3-magellan/scripts/Makefile.frag
    14 --- php-5.2.3/scripts/Makefile.frag 2005-11-22 00:08:02.000000000 +0100
    15 +++ php-5.2.3-magellan/scripts/Makefile.frag 2007-07-11 02:26:05.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.3/scripts/php-config.in php-5.2.3-magellan/scripts/php-config.in
    28 --- php-5.2.3/scripts/php-config.in 2006-07-27 10:53:16.000000000 +0200
    29 +++ php-5.2.3-magellan/scripts/php-config.in 2007-07-11 02:26:58.000000000 +0200
    30 @@ -4,7 +4,7 @@
    31 exec_prefix="@exec_prefix@"
    32 version="@PHP_VERSION@"
    33 version_id="@PHP_VERSION_ID@"
    34 -includedir="@includedir@/php"
    35 +includedir="@includedir@/php5"
    36 includes="-I$includedir -I$includedir/main -I$includedir/TSRM -I$includedir/Zend -I$includedir/ext -I$includedir/ext/date/lib"
    37 ldflags="@PHP_LDFLAGS@"
    38 libs="@EXTRA_LIBS@"
    39 diff -Naur php-5.2.3/scripts/phpize.in php-5.2.3-magellan/scripts/phpize.in
    40 --- php-5.2.3/scripts/phpize.in 2005-12-12 12:51:45.000000000 +0100
    41 +++ php-5.2.3-magellan/scripts/phpize.in 2007-07-11 02:27:14.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
    52 FILES_BUILD="mkdep.awk scan_makefile_in.awk shtool libtool.m4"