- added systemd directories macros

Changed files:
    adapter.awk -> 1.509
    adapter.sh -> 1.48

diff --git a/adapter.awk b/adapter.awk
index f7faddfbe6293ca69aa4d94aaf1c1d4c98c6c3af..2945f11ebe444107b6beb344cb0a69fcdea37e37 100644 (file)
--- 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 ecf0f77dc4e3fac8be7d22cea60394ea1a87a398..d41fa36cbd70da6e573f8238f4f3370d24ef42e2 100644 (file)
--- 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