php-paths.patch

   1 Only in php-7.0.15: php-paths.patch
   2 diff -ur php-7.0.15.orig/scripts/Makefile.frag php-7.0.15/scripts/Makefile.frag
   3 --- php-7.0.15.orig/scripts/Makefile.frag       2017-01-17 11:51:48.000000000 +0000
   4 +++ php-7.0.15/scripts/Makefile.frag    2017-02-08 12:55:12.675405862 +0000
   5 @@ -3,8 +3,8 @@
   6  # Build environment install
   7  #
   8
   9 -phpincludedir = $(includedir)/php
  10 -phpbuilddir = $(libdir)/build
  11 +phpincludedir = $(includedir)/php/php$(program_suffix)
  12 +phpbuilddir = $(libdir)/php/php$(program_suffix)/build
  13
  14  BUILD_FILES = \
  15         scripts/phpize.m4 \
  16 diff -ur php-7.0.15.orig/scripts/php-config.in php-7.0.15/scripts/php-config.in
  17 --- php-7.0.15.orig/scripts/php-config.in       2017-01-17 11:51:48.000000000 +0000
  18 +++ php-7.0.15/scripts/php-config.in    2017-02-08 12:55:12.676405862 +0000
  19 @@ -6,7 +6,7 @@
  20  exec_prefix="@exec_prefix@"
  21  version="@PHP_VERSION@"
  22  vernum="@PHP_VERSION_ID@"
  23 -include_dir="@includedir@/php"
  24 +include_dir="@includedir@/php/php@program_suffix@"
  25  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"
  26  ldflags="@PHP_LDFLAGS@"
  27  libs="@EXTRA_LIBS@"
  28 diff -ur php-7.0.15.orig/scripts/phpize.in php-7.0.15/scripts/phpize.in
  29 --- php-7.0.15.orig/scripts/phpize.in   2017-01-17 11:51:48.000000000 +0000
  30 +++ php-7.0.15/scripts/phpize.in        2017-02-08 12:55:12.676405862 +0000
  31 @@ -4,8 +4,8 @@
  32  prefix='@prefix@'
  33  datarootdir='@datarootdir@'
  34  exec_prefix="`eval echo @exec_prefix@`"
  35 -phpdir="`eval echo @libdir@`/build"
  36 -includedir="`eval echo @includedir@`/php"
  37 +phpdir="`eval echo @libdir@`/php/php@program_suffix@/build"
  38 +includedir="`eval echo @includedir@`/php/php@program_suffix@"
  39  builddir="`pwd`"
  40  SED="@SED@"
  41