[packages/adapter: 205/631] - moved pkgconfig subst to use_files_macros()

[glen]

commit 97dae8dc463768b1aa197d0c70256ed92a731406
Author: Elan Ruusamäe <glen at pld-linux.org>
Date:   Mon Oct 10 09:18:48 2005 +0000

    - moved pkgconfig subst to use_files_macros()
    
    Changed files:
        adapter.awk -> 1.196

 adapter.awk | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)
---
diff --git a/adapter.awk b/adapter.awk
index 96a2919..10961c4 100644
--- a/adapter.awk
+++ b/adapter.awk
@@ -846,10 +846,6 @@ function use_macros()
 
 	gsub(examplesdir, "%{_examplesdir}")
 
-	gsub(libdir "/pkgconfig", "%{_pkgconfigdir}");
-	gsub("%{_libdir}/pkgconfig", "%{_pkgconfigdir}");
-	gsub("%{_prefix}/lib/pkgconfig", "%{_pkgconfigdir}");
-
 	if (prefix != "/") {
 		# leave --with-foo=/usr alone
 		if ($0 !~ "--with.*=.*" prefix) {
@@ -862,6 +858,8 @@ function use_macros()
 					continue;
 				if ($c ~ prefix "/lib/sendmail")
 					continue;
+				if ($c ~ prefix "/lib/pkgconfig")
+					continue;
 				gsub(prefix, "%{_prefix}", $c)
 			}
 		}
@@ -970,7 +968,6 @@ function use_files_macros(	i, n, t, a)
 		}
 	}
 
-
 	# kill leading zeros
 	if (/%attr\(0[1-9]/) {
 		gsub("%attr\\(0", "%attr(")
@@ -1000,6 +997,10 @@ function use_files_macros(	i, n, t, a)
 	$0 = fixedsub("%{perl_man1dir}", "%{_mandir}/man1", $0);
 	$0 = fixedsub("%{perl_man3dir}", "%{_mandir}/man3", $0);
 	$0 = fixedsub("%{perl_bin}", "%{_bindir}", $0);
+
+	gsub(libdir "/pkgconfig", "%{_pkgconfigdir}");
+	gsub("%{_libdir}/pkgconfig", "%{_pkgconfigdir}");
+	gsub("%{_prefix}/lib/pkgconfig", "%{_pkgconfigdir}");
 }
 
 function fill(ch, n, i) {
================================================================

---- gitweb:

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