SPECS: adapter.awk - allow macros in _libdir and _datadir definitions

glen glen at pld-linux.org
Thu May 4 21:10:19 CEST 2006


Author: glen                         Date: Thu May  4 19:10:19 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- allow macros in _libdir and _datadir definitions

---- Files affected:
SPECS:
   adapter.awk (1.301 -> 1.302) 

---- Diffs:

================================================================
Index: SPECS/adapter.awk
diff -u SPECS/adapter.awk:1.301 SPECS/adapter.awk:1.302
--- SPECS/adapter.awk:1.301	Wed Apr 12 13:34:09 2006
+++ SPECS/adapter.awk	Thu May  4 21:10:14 2006
@@ -189,8 +189,14 @@
 		bindir = $3
 	if ($2 ~ /_sbindir/)
 		sbindir = $3
-	if ($2 ~ /_libdir/)
-		libdir = $3
+	if ($2 ~ /_libdir/) {
+		if ($3 ~ /^%\(/) {
+			# TODO: should escape for latter checks like: ($c ~ sysconfdir "/{?cron.")
+			libdir = "%%%%%%%%%%%%%%"
+		} else {
+			libdir = $3
+		}
+	}
 	if ($2 ~ /_sysconfdir/) {
 		if ($3 ~ /^%\(/) {
 			# TODO: should escape for latter checks like: ($c ~ sysconfdir "/{?cron.")
@@ -199,8 +205,14 @@
 			sysconfdir = $3
 		}
 	}
-	if ($2 ~ /_datadir/)
-		datadir = $3
+	if ($2 ~ /_datadir/) {
+		if ($3 ~ /^%\(/) {
+			# TODO: should escape for latter checks like: ($c ~ sysconfdir "/{?cron.")
+			datadir = "%%%%%%%%%%%%%%"
+		} else {
+			datadir = $3
+		}
+	}
 	if ($2 ~ /_includedir/)
 		includedir = $3
 	if ($2 ~ /_mandir/)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/adapter.awk?r1=1.301&r2=1.302&f=u



More information about the pld-cvs-commit mailing list