From: Elan Ruusamäe <glen@delfi.ee>
Date: Mon, 2 Jun 2014 08:31:55 +0000 (+0300)
Subject: subst bash_compdir
X-Git-Tag: auto/th/rpm-build-tools-4.6-4~36
X-Git-Url: http://git.pld-linux.org/?p=packages%2Frpm-build-tools.git;a=commitdiff_plain;h=98f6ba78d5c1a38a31e3e272376a9586410f4176

subst bash_compdir
---

diff --git a/adapter.awk b/adapter.awk
index 53aafec..a68309b 100644
--- a/adapter.awk
+++ b/adapter.awk
@@ -1258,6 +1258,7 @@ function use_macros()
 	gsub(php_pear_dir, "%{php_pear_dir}")
 	gsub(php_data_dir, "%{php_data_dir}")
 
+	# change to %{_datadir}, with some exceptions
 	for (c = 1; c <= NF; c++) {
 		if ($c ~ datadir "/automake")
 			continue
@@ -1268,6 +1269,9 @@ function use_macros()
 		gsub(datadir, "%{_datadir}", $c)
 	}
 
+	# bash completions dir, after datadir change
+	gsub("%{_datadir}/bash-completion/completions", "%{bash_compdir}")
+
 	gsub("%{prefix}/share", "%{_datadir}")
 	if (prefix"/share" == datadir)
 		gsub("%{_prefix}/share", "%{_datadir}")