From a1d41e17a5c3861becd66f1c9dba7eb39ae4c478 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 13 Sep 2012 22:17:46 +0200
Subject: [PATCH] rpm: expose preset dir as rpm macro and in systemd.pc

---
 Makefile.am                | 4 ++++
 src/core/macros.systemd.in | 1 +
 src/core/systemd.pc.in     | 2 ++
 3 files changed, 7 insertions(+)

diff --git a/Makefile.am b/Makefile.am
index be97193b4..5674f1019 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -65,6 +65,7 @@ rpmmacrosdir=$(sysconfdir)/rpm
 # Our own, non-special dirs
 pkgsysconfdir=$(sysconfdir)/systemd
 userunitdir=$(prefix)/lib/systemd/user
+userpresetdir=$(prefix)/lib/systemd/user-preset
 tmpfilesdir=$(prefix)/lib/tmpfiles.d
 sysctldir=$(prefix)/lib/sysctl.d
 usergeneratordir=$(prefix)/lib/systemd/user-generators
@@ -73,6 +74,7 @@ systemgeneratordir=$(rootlibexecdir)/system-generators
 systemshutdowndir=$(rootlibexecdir)/system-shutdown
 systemsleepdir=$(rootlibexecdir)/system-sleep
 systemunitdir=$(rootprefix)/lib/systemd/system
+systempresetdir=$(rootprefix)/lib/systemd/system-preset
 udevlibexecdir=$(rootprefix)/lib/udev
 udevhomedir = $(udevlibexecdir)
 udevrulesdir = $(udevlibexecdir)/rules.d
@@ -3450,6 +3452,8 @@ SED_PROCESS = \
 		-e 's,@pkgdatadir\@,$(pkgdatadir),g' \
 		-e 's,@systemunitdir\@,$(systemunitdir),g' \
 		-e 's,@userunitdir\@,$(userunitdir),g' \
+		-e 's,@systempresetdir\@,$(systempresetdir),g' \
+		-e 's,@userpresetdir\@,$(userpresetdir),g' \
 		-e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \
 		-e 's,@PACKAGE_NAME\@,$(PACKAGE_NAME),g' \
 		-e 's,@PACKAGE_URL\@,$(PACKAGE_URL),g' \
diff --git a/src/core/macros.systemd.in b/src/core/macros.systemd.in
index 86e869307..e521df337 100644
--- a/src/core/macros.systemd.in
+++ b/src/core/macros.systemd.in
@@ -20,6 +20,7 @@
 # RPM macros for packages installing systemd unit files
 
 %_unitdir @systemunitdir@
+%_presetdir @systempresetdir@
 
 %systemd_requires \
 Requires(post): systemd \
diff --git a/src/core/systemd.pc.in b/src/core/systemd.pc.in
index 49f65b2a6..2f49d5df5 100644
--- a/src/core/systemd.pc.in
+++ b/src/core/systemd.pc.in
@@ -9,7 +9,9 @@ prefix=@prefix@
 exec_prefix=@exec_prefix@
 systemdutildir=@rootlibexecdir@
 systemdsystemunitdir=@systemunitdir@
+systemdsystempresetdir=@systempresetdir@
 systemduserunitdir=@userunitdir@
+systemduserpresetdir=@userpresetdir@
 systemdsystemconfdir=@pkgsysconfdir@/system
 systemduserconfdir=@pkgsysconfdir@/user
 systemdsystemunitpath=${systemdsystemconfdir}:/etc/systemd/system:/run/systemd/system:/usr/local/lib/systemd/system:${systemdsystemunitdir}:/usr/lib/systemd/system:/lib/systemd/system
-- 
2.30.2