From 99956d123945a46787a7774e101440b92506d842 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20R=C4=99korajski?= Date: Sun, 5 Feb 2012 12:15:53 +0000 Subject: [PATCH] - 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 100644 --- 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 -- 2.44.0