packages: adapter.awk, adapter - added systemd directories macros

[baggins]

Author: baggins                      Date: Sun Feb  5 12:15:59 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- added systemd directories macros

---- Files affected:
packages:
   adapter.awk (1.508 -> 1.509) , adapter (1.47 -> 1.48) 

---- Diffs:

================================================================
Index: packages/adapter.awk
diff -u packages/adapter.awk:1.508 packages/adapter.awk:1.509
--- packages/adapter.awk:1.508	Thu Dec 29 00:08:22 2011
+++ packages/adapter.awk	Sun Feb  5 13:15:53 2012
@@ -1200,6 +1200,9 @@
 	gsub(libdir, "%{_libdir}")
 	gsub(javadir, "%{_javadir}")
 
+	gsub(systemdunitdir, "%{systemdunitdir}")
+	gsub(systemdtmpfilesdir, "%{systemdtmpfilesdir}")
+
 	gsub(bindir, "%{_bindir}")
 	gsub("%{prefix}/bin", "%{_bindir}")
 	if (prefix"/bin" == bindir)
@@ -1458,9 +1461,6 @@
 	if (pear_subclass) {
 		gsub("%{_subclass}", pear_subclass);
 	}
-
-	gsub("/lib/systemd/system", "%{systemdunitdir}")
-
 }
 
 function format_configure(line,		n, a, s) {
@@ -1957,6 +1957,9 @@
 	php_pear_dir = ENVIRON["php_pear_dir"]
 	php_data_dir = ENVIRON["php_data_dir"]
 	tmpdir = ENVIRON["tmpdir"]
+
+	systemdunitdir = ENVIRON["systemdunitdir"]
+	systemdtmpfilesdir = ENVIRON["systemdtmpfilesdir"]
 }
 
 # php virtual deps as discussed in devel-en

================================================================
Index: packages/adapter
diff -u packages/adapter:1.47 packages/adapter:1.48
--- packages/adapter:1.47	Tue Jan 18 08:16:38 2011
+++ packages/adapter	Sun Feb  5 13:15:53 2012
@@ -223,6 +223,9 @@
 	php_pear_dir
 	php_data_dir
 	tmpdir
+
+	systemdunitdir
+	systemdtmpfilesdir
 "
 	eval_expr=""
 	for macro in $macros; do
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/adapter.awk?r1=1.508&r2=1.509&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/adapter?r1=1.47&r2=1.48&f=u