[packages/adapter: 541/631] - added systemd directories macros

[glen]

commit df79d912ff2ca14aa051ffa5b9d7e014a1c9745b
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sun Feb 5 12:15:53 2012 +0000

    - added systemd directories macros
    
    Changed files:
        adapter.awk -> 1.509
        adapter.sh -> 1.48

 adapter.awk | 9 ++++++---
 adapter.sh  | 3 +++
 2 files changed, 9 insertions(+), 3 deletions(-)
---
diff --git a/adapter.awk b/adapter.awk
index f7faddf..2945f11 100644
--- a/adapter.awk
+++ b/adapter.awk
@@ -1200,6 +1200,9 @@ function use_macros()
 	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 @@ function use_macros()
 	if (pear_subclass) {
 		gsub("%{_subclass}", pear_subclass);
 	}
-
-	gsub("/lib/systemd/system", "%{systemdunitdir}")
-
 }
 
 function format_configure(line,		n, a, s) {
@@ -1957,6 +1957,9 @@ function import_rpm_macros() {
 	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
diff --git a/adapter.sh b/adapter.sh
index ecf0f77..d41fa36 100755
--- a/adapter.sh
+++ b/adapter.sh
@@ -223,6 +223,9 @@ import_rpm_macros() {
 	php_pear_dir
 	php_data_dir
 	tmpdir
+
+	systemdunitdir
+	systemdtmpfilesdir
 "
 	eval_expr=""
 	for macro in $macros; do
================================================================

---- gitweb:

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