macros: Install systemd unit files to /usr.

Introduce unitdir variable.

diff --git a/macros/arch.macro b/macros/arch.macro
index 536e9d2f731e8f5759583cf432ffdb6f683c8c47..e3d38cc1e7b1cadeb3f3974ca1f8128e3872e003 100644 (file)
--- a/macros/arch.macro
+++ b/macros/arch.macro
@@ -15,6 +15,7 @@ libdir            = %{exec_prefix}/%{lib}
 includedir        = %{prefix}/include
 infodir           = %{datadir}/info
 mandir            = %{datadir}/man
+unitdir           = %{prefix}/lib/systemd/system
 
 if "%{DISTRO_ARCH}" == "x86_64"
        # Libs are installed in /lib64 and %{prefix}/lib64 on x86_64

diff --git a/macros/systemd.macro b/macros/systemd.macro
index 266579c8c24495c8c6a0795095f59d1e980b5f09..9dc74ff0b64069aa895122a67e3246f89cfd0759 100644 (file)
--- a/macros/systemd.macro
+++ b/macros/systemd.macro
@@ -1,19 +1,17 @@
 
-
-SYSTEMD_UNIT_DIR = /lib/systemd/system
-
 SYSTEMD_TMPFILES_DIR = /usr/lib/tmpfiles.d
 
-def MACRO_INSTALL_SYSTEMD_FILES
+MACRO_INSTALL_SYSTEMD_FILES
        for file in %{DIR_SOURCE}/systemd/*; do
                [ -e "${file}" ] || continue
-               mkdir -p %{BUILDROOT}/%{SYSTEMD_UNIT_DIR}
-               cp -vf ${file} %{BUILDROOT}/%{SYSTEMD_UNIT_DIR}/$(basename ${file})
+
+               mkdir -p %{BUILDROOT}/%{unitdir}
+               cp -vf ${file} %{BUILDROOT}/%{unitdir}/$(basename ${file})
        done
        unset file
 end
 
-def MACRO_INSTALL_SYSTEMD_TMPFILES
+MACRO_INSTALL_SYSTEMD_TMPFILES
        for file in %{DIR_SOURCE}/*.tmpfiles; do
                [ -e "${file}" ] || continue
                mkdir -p %{BUILDROOT}/%{SYSTEMD_TMPFILES_DIR}