Add patch to install php7 module directly to APXS_LIBEXEC
authorThijs Kinkhorst <thijs@debian.org>
Wed, 15 Jun 2016 07:18:03 +0000 (09:18 +0200)
committerOndřej Surý <ondrej@debian.org>
Sun, 3 Aug 2025 07:32:21 +0000 (09:32 +0200)
Gbp-Pq: Name 0030-Add-patch-to-install-php7-module-directly-to-APXS_LI.patch

sapi/apache2handler/config.m4

index e335721f19e9829aa29b6a8a7c1828742f10d38b..e7549333e55e0cd5f0bf14465e4c72a4b6bce676 100644 (file)
@@ -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])