From: Ondřej Surý <ondrej@sury.org>
Date: Mon, 14 Mar 2016 15:09:34 +0000 (+0100)
Subject: Really expand $libdir/$datadir into @EXPANDED_LIBDIR/DATADIR@
X-Git-Tag: archive/raspbian/8.4.11-1+rpi1~20
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=11e78a55475d6c63880285fb362b3960896797c0;p=php8.4.git

Really expand $libdir/$datadir into @EXPANDED_LIBDIR/DATADIR@


Gbp-Pq: Name 0028-Really-expand-libdir-datadir-into-EXPANDED_LIBDIR-DA.patch
---

diff --git a/configure.ac b/configure.ac
index 6b0d7611..fc7f49ea 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1358,9 +1358,9 @@ EXPANDED_LOCALSTATEDIR=$(eval echo $localstatedir)
 EXPANDED_BINDIR=$(eval echo $bindir)
 EXPANDED_SBINDIR=$(eval echo $sbindir)
 EXPANDED_MANDIR=$(eval echo $mandir)
-EXPANDED_LIBDIR=$libdir
+EXPANDED_LIBDIR=$(eval echo $libdir)
 EXPANDED_SYSCONFDIR=$(eval echo $sysconfdir)
-EXPANDED_DATADIR=$datadir
+EXPANDED_DATADIR=$(eval echo $datadir)
 EXPANDED_PHP_CONFIG_FILE_PATH=$(eval echo "$PHP_CONFIG_FILE_PATH")
 EXPANDED_PHP_CONFIG_FILE_SCAN_DIR=$(eval echo "$PHP_CONFIG_FILE_SCAN_DIR")
 INCLUDE_PATH=.:$EXPANDED_PEAR_INSTALLDIR