From 47f7b1839cd61cbf42536c9976036bcb2b2ca57a Mon Sep 17 00:00:00 2001
From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 13 Apr 2012 17:46:27 +0200
Subject: [PATCH] macros: Install systemd unit files to /usr.

Introduce unitdir variable.
---
 macros/arch.macro    |  1 +
 macros/systemd.macro | 12 +++++-------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/macros/arch.macro b/macros/arch.macro
index 536e9d2f7..e3d38cc1e 100644
--- 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 266579c8c..9dc74ff0b 100644
--- 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}
-- 
2.39.5