[packages/adapter: 138/631] - skip replace of /usr/share/automake with datadir/prefix macro

glen glen at pld-linux.org
Mon Sep 12 19:46:02 CEST 2016


commit c4adc3766f007784a423f4a10ff7af24f8b64b41
Author: Elan Ruusamäe <glen at pld-linux.org>
Date:   Thu Feb 24 11:01:34 2005 +0000

    - skip replace of /usr/share/automake with datadir/prefix macro
    
    Changed files:
        adapter.awk -> 1.133

 adapter.awk | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)
---
diff --git a/adapter.awk b/adapter.awk
index edee17d..b196f82 100644
--- a/adapter.awk
+++ b/adapter.awk
@@ -593,9 +593,14 @@ function use_macros()
 		gsub(sysconfdir, "%{_sysconfdir}", $c)
 	}
 
-	gsub(datadir, "%{_datadir}")
+	for (c = 1; c <= NF; c++) {
+		if ($c ~ datadir "/automake")
+			continue;
+		gsub(datadir, "%{_datadir}", $c)
+	}
+
 	gsub("%{prefix}/share", "%{_datadir}")
-	if(prefix"/share" == datadir)
+	if (prefix"/share" == datadir)
 		gsub("%{_prefix}/share", "%{_datadir}")
 
 	gsub(includedir, "%{_includedir}")
@@ -623,6 +628,8 @@ function use_macros()
 		for (c = 1; c <= NF; c++) {
 			if ($c ~ prefix "/sbin/fix-info-dir")
 				continue;
+			if ($c ~ prefix "/share/automake")
+				continue;
 			gsub(prefix, "%{_prefix}", $c)
 		}
 		gsub("%{prefix}", "%{_prefix}")
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/adapter.git/commitdiff/6ca0126d4d0c8c79feb7db10b0a0fade0f3b8885



More information about the pld-cvs-commit mailing list