From: Marcin Krol <hawk@tld-linux.org>
Date: Sat, 26 Sep 2020 19:44:20 +0000 (+0200)
Subject: - fix PHP macros to use proper version of php-config
X-Git-Url: https://git.tld-linux.org/?a=commitdiff_plain;h=41a8035cb2cd12eae13a5d6ed282559894274ed6;p=packages%2Frpm-tld-macros.git

- fix PHP macros to use proper version of php-config
---

diff --git a/macros.php b/macros.php
index f2a83a3..31a0b14 100644
--- a/macros.php
+++ b/macros.php
@@ -15,9 +15,9 @@
 
 %php_pear_dir		/usr/share/pear
 %php_data_dir		/usr/share/php
-%php_extensiondir	%{expand:%%global php_extensiondir %(php-config --extension-dir 2>/dev/null || echo ERROR)}%php_extensiondir
-%php_sysconfdir		%{expand:%%global php_sysconfdir %(php-config --sysconfdir 2>/dev/null || echo ERROR)}%php_sysconfdir
-%php_includedir		%{expand:%%global php_includedir %(php-config --include-dir 2>/dev/null || echo ERROR)}%php_includedir
+%php_extensiondir	%{expand:%%global php_extensiondir %(php-config%{?php_suffix} --extension-dir 2>/dev/null || echo ERROR)}%php_extensiondir
+%php_sysconfdir		%{expand:%%global php_sysconfdir %(php-config%{?php_suffix} --sysconfdir 2>/dev/null || echo ERROR)}%php_sysconfdir
+%php_includedir		%{expand:%%global php_includedir %(php-config%{?php_suffix} --include-dir 2>/dev/null || echo ERROR)}%php_includedir
 
 # extract php/zend api versions
 %php_major_version	%{expand:%%global php_major_version %(awk '/#define PHP_MAJOR_VERSION/{print $3}' %{php_includedir}/main/php_version.h 2>/dev/null || echo ERROR)}%php_major_version
diff --git a/rpm-tld-macros.spec b/rpm-tld-macros.spec
index e48208c..63b5496 100644
--- a/rpm-tld-macros.spec
+++ b/rpm-tld-macros.spec
@@ -6,7 +6,7 @@ Summary:	TLD Linux RPM macros
 Summary(pl.UTF-8):	Makra RPM dla Linuksa TLD
 Name:		rpm-tld-macros
 Version:	%{rpm_macros_rev}
-Release:	2
+Release:	3
 License:	GPL v2+
 Group:		Development/Building
 Source0:	macros.tld