php-paths.patch

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