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.2.27-1+rpi1^2~16
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=27aee538fc0a8d677adf9a3637a7535d724bb0ec;p=php8.2.git

Add patch to install php7 module directly to APXS_LIBEXEC


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

diff --git a/sapi/apache2handler/config.m4 b/sapi/apache2handler/config.m4
index bcdb188d..c295f04c 100644
--- a/sapi/apache2handler/config.m4
+++ b/sapi/apache2handler/config.m4
@@ -64,18 +64,9 @@ if test "$PHP_APXS2" != "no"; then
   fi
 
   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)