[packages/adapter] macroize commands printed by autoreconf -vif

[glen]

commit 74774c2e66821124dfc68fc2ef6f78e2248c1e75
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Tue Sep 13 23:47:41 2016 +0300

    macroize commands printed by autoreconf -vif

 adapter.awk | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)
---
diff --git a/adapter.awk b/adapter.awk
index 7e26f90..1b682f8 100644
--- a/adapter.awk
+++ b/adapter.awk
@@ -440,11 +440,11 @@ function b_makekey(a, b,	s) {
 	$0 = fixedsub("libtoolize --force --copy", "%{__libtoolize}", $0)
 	$0 = fixedsub("libtoolize -c -f --automake", "%{__libtoolize}", $0)
 
-	sub(/^aclocal$/, "%{__aclocal}")
-	sub(/^autoheader$/, "%{__autoheader}")
-	sub(/^autoconf$/, "%{__autoconf}")
+	sub(/^aclocal( --force)?$/, "%{__aclocal}")
+	sub(/^(%{_bindir}\/)?autoheader( --force)?$/, "%{__autoheader}")
+	sub(/^(%{_bindir}\/)?autoconf( --force)?$/, "%{__autoconf}")
 	sub(/^automake$/, "%{__automake}")
-	sub(/^libtoolize$/, "%{__libtoolize}")
+	sub(/^libtoolize( --copy --force)?$/, "%{__libtoolize}")
 
 	# atrpms
 	$0 = fixedsub("%perl_configure", "%{__perl} Makefile.PL \\\n\tINSTALLDIRS=vendor", $0)
@@ -1339,6 +1339,7 @@ function use_macros()
 	gsub(php_data_dir, "%{php_data_dir}")
 	gsub("%{_datadir}/php", "%{php_data_dir}")
 	gsub("%{php_home}", "%{php_data_dir}")
+	gsub("%{phpdir}", "%{php_data_dir}")
 	gsub("%{php_extdir}", "%{php_extensiondir}")
 
 	# change to %{_datadir}, with some exceptions
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/adapter.git/commitdiff/74774c2e66821124dfc68fc2ef6f78e2248c1e75