diff options
| author | Lennart Poettering <lennart@poettering.net> | 2012-09-13 22:17:46 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2012-09-13 22:17:46 +0200 |
| commit | a1d41e17a5c3861becd66f1c9dba7eb39ae4c478 (patch) | |
| tree | fa129a1091bc299c0be7629980588a49387625c1 | |
| parent | 095b2d7ab9e7d66d44b93ab6e03ca69fd9e7020c (diff) | |
rpm: expose preset dir as rpm macro and in systemd.pc
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | src/core/macros.systemd.in | 1 | ||||
| -rw-r--r-- | src/core/systemd.pc.in | 2 |
3 files changed, 7 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am index be97193b45..5674f1019a 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 86e869307c..e521df337d 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 49f65b2a65..2f49d5df52 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 |