SPECS: adapter.awk - macroize

glen glen at pld-linux.org
Sat Mar 4 13:15:36 CET 2006


Author: glen                         Date: Sat Mar  4 12:15:36 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- macroize

---- Files affected:
SPECS:
   adapter.awk (1.288 -> 1.289) 

---- Diffs:

================================================================
Index: SPECS/adapter.awk
diff -u SPECS/adapter.awk:1.288 SPECS/adapter.awk:1.289
--- SPECS/adapter.awk:1.288	Sat Mar  4 13:02:47 2006
+++ SPECS/adapter.awk	Sat Mar  4 13:15:31 2006
@@ -71,6 +71,8 @@
 	"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 @@
 	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}")
================================================================

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



More information about the pld-cvs-commit mailing list