From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Sun, 31 Jan 2021 16:16:32 +0000 (+0100)
Subject: Move rpm stuff into a separate src/rpm/ directory
X-Git-Tag: v248-rc1~115^2~5
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2a9b4bbe3ec3e414dbc02e909c11c9403dba57b1;p=thirdparty%2Fsystemd.git

Move rpm stuff into a separate src/rpm/ directory

It is only of interest to rpm-based distros, we can move it out of src/core/
which is pretty busy.
---

diff --git a/meson.build b/meson.build
index 09d8122091d..226dc90f9e7 100644
--- a/meson.build
+++ b/meson.build
@@ -1746,6 +1746,7 @@ subdir('src/partition')
 subdir('src/portable')
 subdir('src/pstore')
 subdir('src/resolve')
+subdir('src/rpm')
 subdir('src/shutdown')
 subdir('src/sysext')
 subdir('src/systemctl')
diff --git a/src/core/meson.build b/src/core/meson.build
index b8089c51ce7..a389c906b36 100644
--- a/src/core/meson.build
+++ b/src/core/meson.build
@@ -164,11 +164,9 @@ core_includes = [includes, include_directories('.')]
 
 systemd_sources = files('main.c')
 
-in_files = [['macros.systemd',   rpmmacrosdir],
-            ['system.conf',      pkgsysconfdir],
+in_files = [['system.conf',      pkgsysconfdir],
             ['user.conf',        pkgsysconfdir],
-            ['systemd.pc',       pkgconfigdatadir],
-            ['triggers.systemd', '']]
+            ['systemd.pc',       pkgconfigdatadir]]
 
 foreach item : in_files
         file = item[0]
diff --git a/src/core/macros.systemd.in b/src/rpm/macros.systemd.in
similarity index 100%
rename from src/core/macros.systemd.in
rename to src/rpm/macros.systemd.in
diff --git a/src/rpm/meson.build b/src/rpm/meson.build
new file mode 100644
index 00000000000..8e5283ff550
--- /dev/null
+++ b/src/rpm/meson.build
@@ -0,0 +1,14 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+configure_file(
+        input : 'macros.systemd.in',
+        output : 'macros.systemd',
+        configuration : substs,
+        install_dir : rpmmacrosdir == 'no' ? '' : rpmmacrosdir)
+
+configure_file(
+        input : 'triggers.systemd.in',
+        output : 'triggers.systemd',
+        configuration : substs)
+# This doesn't get installed anywhere, it needs to included in the rpm spec
+# file definition.
diff --git a/src/core/triggers.systemd.in b/src/rpm/triggers.systemd.in
similarity index 100%
rename from src/core/triggers.systemd.in
rename to src/rpm/triggers.systemd.in