packages: adapter.awk - replace systemd macros before libdir, to have chanc...

glen glen at pld-linux.org
Fri Mar 30 20:43:32 CEST 2012


Author: glen                         Date: Fri Mar 30 18:43:32 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- replace systemd macros before libdir, to have chance to work on 32bit libdirs

---- Files affected:
packages:
   adapter.awk (1.511 -> 1.512) 

---- Diffs:

================================================================
Index: packages/adapter.awk
diff -u packages/adapter.awk:1.511 packages/adapter.awk:1.512
--- packages/adapter.awk:1.511	Fri Mar 30 20:41:32 2012
+++ packages/adapter.awk	Fri Mar 30 20:43:27 2012
@@ -1187,6 +1187,9 @@
 	gsub(ruby_sitelibdir, "%{ruby_sitelibdir}")
 	gsub(ruby_rdocdir, "%{ruby_rdocdir}")
 
+	gsub(systemdunitdir, "%{systemdunitdir}")
+	gsub(systemdtmpfilesdir, "%{systemdtmpfilesdir}")
+
 	gsub("%{_datadir}/applications", "%{_desktopdir}")
 	gsub("%{_datadir}/pixmaps", "%{_pixmapsdir}")
 	gsub("%{_datadir}/java", "%{_javadir}")
@@ -1202,9 +1205,6 @@
 
 	gsub(libdir, "%{_libdir}")
 	gsub(javadir, "%{_javadir}")
-
-	gsub(systemdunitdir, "%{systemdunitdir}")
-	gsub(systemdtmpfilesdir, "%{systemdtmpfilesdir}")
 
 	gsub(bindir, "%{_bindir}")
 	gsub("%{prefix}/bin", "%{_bindir}")
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/adapter.awk?r1=1.511&r2=1.512



More information about the pld-cvs-commit mailing list