[packages/adapter: 108/631] - adapterized man.spec openoffice.spec wxGTK.spec

glen glen at pld-linux.org
Mon Sep 12 19:43:31 CEST 2016


commit 0965a1a0d20047a8c637ae522307d4f957352ffd
Author: ankry <ankry at pld-linux.org>
Date:   Sat Dec 14 00:28:22 2002 +0000

    - adapterized man.spec openoffice.spec wxGTK.spec
    
    Changed files:
        adapter.awk -> 1.108

 adapter.awk | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/adapter.awk b/adapter.awk
index 5130588..ea72b3f 100644
--- a/adapter.awk
+++ b/adapter.awk
@@ -546,7 +546,7 @@ function use_macros()
 		gsub("%{_prefix}/lib", "%{_libdir}")
 
 	for (c = 1; c <= NF; c++) {
-		if ($c ~ sysconfdir "/{?cron.d")
+		if ($c ~ sysconfdir "/{?cron.")
 			continue;
 		if ($c ~ sysconfdir "/{?crontab.d")
 			continue;
@@ -589,7 +589,9 @@ function use_macros()
 	gsub("%{prefix}/info", "%{_infodir}")
 	gsub("%{_prefix}/info", "%{_infodir}")
 
-	gsub("%{_datadir}/aclocal", "%{_aclocaldir}")
+	if (prefix !~ "/X11R6") {
+		gsub("%{_datadir}/aclocal", "%{_aclocaldir}")
+	}
 
 	if (prefix != "/") {
 		for (c = 1; c <= NF; c++) {
================================================================

---- gitweb:

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



More information about the pld-cvs-commit mailing list