[packages/adapter: 299/631] - macroize

[glen]

commit 4a62fb54f18a35638e009ac9ad736a4a47efaa55
Author: Elan Ruusamäe <glen at pld-linux.org>
Date:   Sat Mar 4 12:15:31 2006 +0000

    - macroize
    
    Changed files:
        adapter.awk -> 1.289

 adapter.awk | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
---
diff --git a/adapter.awk b/adapter.awk
index ad85eac..faec91a 100644
--- a/adapter.awk
+++ b/adapter.awk
@@ -71,6 +71,8 @@ BEGIN {
 	"rpm --eval %_infodir"	| getline infodir
 	"rpm --eval %_examplesdir"	| getline examplesdir
 	"rpm --eval %_defaultdocdir"	| getline docdir
+	"rpm --eval %_desktopdir" | getline desktopdir
+	"rpm --eval %_pixmapsdir" | getline pixmapsdir
 
 	"rpm --eval %perl_sitearch" | getline perl_sitearch
 	"rpm --eval %perl_archlib" | getline perl_archlib
@@ -948,9 +950,11 @@ function use_macros()
 	gsub(perl_sitelib, "%{perl_sitelib}")
 	
 	gsub(py_sitescriptdir, "%{py_sitescriptdir}")
-	gsub("%{_libdir}/python2.4/site-packages", "%{py_sitedir}")
 	gsub(py_sitedir, "%{py_sitedir}")
 	gsub(py_scriptdir, "%{py_scriptdir}")
+	gsub("%{_libdir}/python2.4/site-packages", "%{py_sitedir}")
+	gsub("%{_datadir}/applications", "%{_desktopdir}")
+	gsub("%{_datadir}/pixmaps", "%{_pixmapsdir}")
 
 	gsub(bindir, "%{_bindir}")
 	gsub("%{prefix}/bin", "%{_bindir}")
================================================================

---- gitweb:

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