[packages/adapter: 55/631] - do not subst /etc/cron.d, - do not subst /usr/sbin/fix-info-dir.

glen glen at pld-linux.org
Mon Sep 12 19:39:04 CEST 2016


commit de69503c263a80b13b5ca2bfaea7ee5b17771f72
Author: kloczek <kloczek at pld-linux.org>
Date:   Wed May 17 00:15:21 2000 +0000

    - do not subst /etc/cron.d,
    - do not subst /usr/sbin/fix-info-dir.
    
    Changed files:
        adapter.awk -> 1.55

 adapter.awk | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)
---
diff --git a/adapter.awk b/adapter.awk
index a0b2ef5..d814863 100644
--- a/adapter.awk
+++ b/adapter.awk
@@ -396,7 +396,12 @@ function use_macros()
 	gsub("%{_prefix}/bin", "%{_bindir}")
 	gsub("%{prefix}/bin", "%{_bindir}")
 
-	gsub(sbindir, "%{_sbindir}")
+	for (c = 1; c <= NF; c++) {
+		if ($c ~ sbindir "/fix-info-dir")
+			continue;
+		gsub(sbindir, "%{_sbindir}", $c)
+	}
+
 	gsub("%{prefix}/sbin", "%{_sbindir}")
 	gsub("%{_prefix}/sbib", "%{_sbindir}")
 
@@ -405,6 +410,8 @@ function use_macros()
 	gsub("%{_prefix}/lib", "%{_libdir}")
 
 	for (c = 1; c <= NF; c++) {
+		if ($c ~ sysconfdir "/cron.d")
+			continue;
 		if ($c ~ sysconfdir "/logrotate.d")
 			continue;
 		if ($c ~ sysconfdir "/pam.d")
@@ -444,7 +451,11 @@ function use_macros()
 	gsub("%{_datadir}/aclocal", "%{_aclocaldir}")
 
 	if (prefix != "/") {
-		gsub(prefix, "%{_prefix}")
+		for (c = 1; c <= NF; c++) {
+			if ($c ~ prefix "/sbin/fix-info-dir")
+				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