[packages/adapter: 58/631] - Honours redefinitions of "_prefix". E.g. will not replace "/usr/bin" with "%{_bindir}" if "_pref

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


commit 7417dcd8c3c10bf3c6e64a5d50f72c2b4ac9adf1
Author: mkochano <mkochano at pld-linux.org>
Date:   Sat Jun 3 22:11:37 2000 +0000

    - Honours redefinitions of "_prefix". E.g. will not replace "/usr/bin" with
      "%{_bindir}" if "_prefix" is defined as "/usr/X11R6".
    
    Changed files:
        adapter.awk -> 1.58

 adapter.awk | 5 +++++
 1 file changed, 5 insertions(+)
---
diff --git a/adapter.awk b/adapter.awk
index f639e01..98c9e3b 100644
--- a/adapter.awk
+++ b/adapter.awk
@@ -280,6 +280,11 @@ preamble == 1 {
 	if ($1 ~ /%define/) {
 		# Do not add %define of _prefix if it already is.
 	       	if ($2 ~ /_prefix/) {
+			sub("^"prefix, $3, bindir)
+			sub("^"prefix, $3, sbindir)
+			sub("^"prefix, $3, libdir)
+			sub("^"prefix, $3, datadir)
+			sub("^"prefix, $3, includedir)
 			prefix = $3
 			x11 = 2
 		}
================================================================

---- gitweb:

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



More information about the pld-cvs-commit mailing list