[packages/adapter: 141/631] - avoid defining sysconfdir with rpm %() eval

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


commit 65b1ded20b8a401c221580cc73af40b99396e83d
Author: Elan Ruusamäe <glen at pld-linux.org>
Date:   Mon Feb 28 18:50:42 2005 +0000

    - avoid defining sysconfdir with rpm %() eval
    
    Changed files:
        adapter.awk -> 1.136

 adapter.awk | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
---
diff --git a/adapter.awk b/adapter.awk
index 29206ec..95911b2 100644
--- a/adapter.awk
+++ b/adapter.awk
@@ -478,7 +478,7 @@ preamble == 1 {
 			sbindir = $3
 		if ($2 ~ /_libdir/)
 			libdir = $3
-		if ($2 ~ /_sysconfdir/)
+		if ($2 ~ /_sysconfdir/ && $3 !~ /^%\(/)
 			sysconfdir = $3
 		if ($2 ~ /_datadir/)
 			datadir = $3
@@ -743,4 +743,3 @@ function cflags(var)
 		sub("\$RPM_OPT_FLAGS", "%{rpmcflags}")
 	return 1
 }
-
================================================================

---- gitweb:

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



More information about the pld-cvs-commit mailing list