[packages/adapter: 202/631] - subst /usr/lib/pkgconfig with a macro - drop applnkdir macro touch (it's obsolete)

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


commit a32d78e83f16bb5b54c491c542660ba25edca3df
Author: Elan Ruusamäe <glen at pld-linux.org>
Date:   Sun Oct 9 13:30:59 2005 +0000

    - subst /usr/lib/pkgconfig with a macro
    - drop applnkdir macro touch (it's obsolete)
    
    Changed files:
        adapter.awk -> 1.193

 adapter.awk | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)
---
diff --git a/adapter.awk b/adapter.awk
index 7ae8632..51099eb 100644
--- a/adapter.awk
+++ b/adapter.awk
@@ -837,6 +837,7 @@ function use_macros()
 	}
 
 	gsub(examplesdir, "%{_examplesdir}")
+	gsub("/usr/lib/pkgconfig", "%{_libdir}/pkgconfig")
 
 	if (prefix != "/") {
 		for (c = 1; c <= NF; c++) {
@@ -854,11 +855,6 @@ function use_macros()
 	gsub("%{PACKAGE_VERSION}", "%{version}")
 	gsub("%{PACKAGE_NAME}", "%{name}")
 
-	# we can move files between the dirs below
-	if ($0 !~ "%{_applnkdir}") {
-		gsub("%{_datadir}/gnome/apps", "%{_applnkdir}")
-	}
-
 	gsub("^make$", "%{__make}")
 	gsub("^make ", "%{__make} ")
 	gsub("^gcc ", "%{__cc} ")
================================================================

---- gitweb:

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



More information about the pld-cvs-commit mailing list