mirror of
https://github.com/systemd/systemd.git
synced 2025-01-10 05:18:17 +03:00
rpm: expose preset dir as rpm macro and in systemd.pc
This commit is contained in:
parent
095b2d7ab9
commit
a1d41e17a5
@ -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' \
|
||||
|
@ -20,6 +20,7 @@
|
||||
# RPM macros for packages installing systemd unit files
|
||||
|
||||
%_unitdir @systemunitdir@
|
||||
%_presetdir @systempresetdir@
|
||||
|
||||
%systemd_requires \
|
||||
Requires(post): systemd \
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user