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>
Fri, 9 Jun 2023 19:37:27 +0000 (21:37 +0200)
Gbp-Pq: Name 0033-Add-patch-to-install-php7-module-directly-to-APXS_LI.patch

sapi/apache2handler/config.m4

index bcdb188d1b8481d3f3f2568c6d842db69efd957c..c295f04c0a70577728a30474c9549cd4b1c85525 100644 (file)
@@ -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)