From: Thijs Kinkhorst <thijs@debian.org>
Date: Wed, 15 Jun 2016 07:18:03 +0000 (+0200)
Subject: Add patch to install php7 module directly to APXS_LIBEXEC
X-Git-Tag: archive/raspbian/8.4.11-1+rpi1~18
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=e567e2d9c30d271ea5fe5a5086f06742f6e65602;p=php8.4.git

Add patch to install php7 module directly to APXS_LIBEXEC


Gbp-Pq: Name 0030-Add-patch-to-install-php7-module-directly-to-APXS_LI.patch
---

diff --git a/sapi/apache2handler/config.m4 b/sapi/apache2handler/config.m4
index e335721f..e7549333 100644
--- a/sapi/apache2handler/config.m4
+++ b/sapi/apache2handler/config.m4
@@ -69,18 +69,9 @@ if test "$PHP_APXS2" != "no"; then
     [AC_MSG_ERROR([Please note that Apache version >= 2.4 is required])])
 
   APXS_LIBEXECDIR='$(INSTALL_ROOT)'$($APXS -q LIBEXECDIR)
-  if test -z $($APXS -q SYSCONFDIR); then
-    INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \
-                 $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
-                       -i -n php"
-  else
-    APXS_SYSCONFDIR='$(INSTALL_ROOT)'$($APXS -q SYSCONFDIR)
-    INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \
-                \$(mkinstalldirs) '$APXS_SYSCONFDIR' && \
-                 $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
-                       -S SYSCONFDIR='$APXS_SYSCONFDIR' \
-                       -i -a -n php"
-  fi
+  INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \
+               $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
+                     -i -n php"
 
   LIBPHP_CFLAGS="-shared"
   PHP_SUBST([LIBPHP_CFLAGS])