[packages/adapter: 597/631] subst bash_compdir
glen
glen at pld-linux.org
Mon Sep 12 20:24:29 CEST 2016
commit 5ca42d7efd6005b7eac702c347ad0dabd27848a6
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Mon Jun 2 11:31:55 2014 +0300
subst bash_compdir
adapter.awk | 4 ++++
1 file changed, 4 insertions(+)
---
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}")
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/adapter.git/commitdiff/6ca0126d4d0c8c79feb7db10b0a0fade0f3b8885
More information about the pld-cvs-commit
mailing list