systemd.macro: Avoid declaring the directory for tmpfiles twice

Message ID 20230402165023.3286-1-stefan.schantl@ipfire.org
State New
Headers
Series systemd.macro: Avoid declaring the directory for tmpfiles twice |

Commit Message

Stefan Schantl April 2, 2023, 4:50 p.m. UTC
  We allready have declared this directory in the arch macro file,
so there is no need in doing this again.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
---
 macros/systemd.macro | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)
  

Patch

diff --git a/macros/systemd.macro b/macros/systemd.macro
index 9dc74ff0..085fabbd 100644
--- a/macros/systemd.macro
+++ b/macros/systemd.macro
@@ -1,6 +1,3 @@ 
-
-SYSTEMD_TMPFILES_DIR = /usr/lib/tmpfiles.d
-
 MACRO_INSTALL_SYSTEMD_FILES
 	for file in %{DIR_SOURCE}/systemd/*; do
 		[ -e "${file}" ] || continue
@@ -14,8 +11,8 @@  end
 MACRO_INSTALL_SYSTEMD_TMPFILES
 	for file in %{DIR_SOURCE}/*.tmpfiles; do
 		[ -e "${file}" ] || continue
-		mkdir -p %{BUILDROOT}/%{SYSTEMD_TMPFILES_DIR}
-		cp -vf ${file} %{BUILDROOT}/%{SYSTEMD_TMPFILES_DIR}/$(basename ${file%*.tmpfiles}).conf
+		mkdir -p %{BUILDROOT}/%{tmpfilesdir}
+		cp -vf ${file} %{BUILDROOT}/%{tmpfilesdir}/$(basename ${file%*.tmpfiles}).conf
 	done
 	unset file
 end