mirror of
https://github.com/systemd/systemd.git
synced 2024-12-22 17:35:35 +03:00
Merge pull request #11827 from keszybz/pkgconfig-variables
Allow overriding pkgconfig prefixes
This commit is contained in:
commit
9a43fc6a2a
@ -234,11 +234,12 @@ conf.set10('MEMORY_ACCOUNTING_DEFAULT', memory_accounting_
|
||||
conf.set_quoted('MEMORY_ACCOUNTING_DEFAULT_YES_NO', memory_accounting_default ? 'yes' : 'no')
|
||||
|
||||
substs.set('prefix', prefixdir)
|
||||
substs.set('rootprefix', rootprefixdir)
|
||||
substs.set('exec_prefix', prefixdir)
|
||||
substs.set('libdir', libdir)
|
||||
substs.set('rootlibdir', rootlibdir)
|
||||
substs.set('includedir', includedir)
|
||||
substs.set('pkgsysconfdir', pkgsysconfdir)
|
||||
substs.set('sysconfdir', sysconfdir)
|
||||
substs.set('bindir', bindir)
|
||||
substs.set('rootbindir', rootbindir)
|
||||
substs.set('rootlibexecdir', rootlibexecdir)
|
||||
|
@ -11,7 +11,7 @@ option('split-bin', type : 'combo', choices : ['auto', 'true', 'false'],
|
||||
option('rootlibdir', type : 'string',
|
||||
description : '''[/usr]/lib/x86_64-linux-gnu or such''')
|
||||
option('rootprefix', type : 'string',
|
||||
description : '''override the root prefix''')
|
||||
description : '''override the root prefix [default '/' if split-usr and '/usr' otherwise]''')
|
||||
option('link-udev-shared', type : 'boolean',
|
||||
description : 'link systemd-udev and its helpers to libsystemd-shared.so')
|
||||
option('link-systemctl-shared', type: 'boolean',
|
||||
|
@ -8,25 +8,27 @@
|
||||
# (at your option) any later version.
|
||||
|
||||
prefix=@prefix@
|
||||
systemdutildir=@rootlibexecdir@
|
||||
systemdsystemunitdir=@systemunitdir@
|
||||
systemdsystempresetdir=@systempresetdir@
|
||||
systemduserunitdir=@userunitdir@
|
||||
systemduserpresetdir=@userpresetdir@
|
||||
systemdsystemconfdir=@pkgsysconfdir@/system
|
||||
systemduserconfdir=@pkgsysconfdir@/user
|
||||
rootprefix=@rootprefix@
|
||||
sysconfdir=@sysconfdir@
|
||||
systemdutildir=${rootprefix}/lib/systemd
|
||||
systemdsystemunitdir=${rootprefix}/lib/systemd/system
|
||||
systemdsystempresetdir=${rootprefix}/lib/systemd/system-preset
|
||||
systemduserunitdir=${prefix}/lib/systemd/user
|
||||
systemduserpresetdir=${prefix}/lib/systemd/user-preset
|
||||
systemdsystemconfdir=${sysconfdir}/systemd/system
|
||||
systemduserconfdir=${sysconfdir}/systemd/user
|
||||
systemdsystemunitpath=${systemdsystemconfdir}:/etc/systemd/system:/run/systemd/system:/usr/local/lib/systemd/system:${systemdsystemunitdir}:/usr/lib/systemd/system:/lib/systemd/system
|
||||
systemduserunitpath=${systemduserconfdir}:/etc/systemd/user:/run/systemd/user:/usr/local/lib/systemd/user:/usr/local/share/systemd/user:${systemduserunitdir}:/usr/lib/systemd/user:/usr/share/systemd/user
|
||||
systemdsystemgeneratordir=@systemgeneratordir@
|
||||
systemdusergeneratordir=@usergeneratordir@
|
||||
systemdsleepdir=@systemsleepdir@
|
||||
systemdshutdowndir=@systemshutdowndir@
|
||||
tmpfilesdir=@tmpfilesdir@
|
||||
sysusersdir=@sysusersdir@
|
||||
sysctldir=@sysctldir@
|
||||
binfmtdir=@binfmtdir@
|
||||
modulesloaddir=@modulesloaddir@
|
||||
catalogdir=@catalogdir@
|
||||
systemdsystemgeneratordir=${rootprefix}/lib/systemd/system-generators
|
||||
systemdusergeneratordir=${prefix}/lib/systemd/user-generators
|
||||
systemdsleepdir=${rootprefix}/lib/systemd/system-sleep
|
||||
systemdshutdowndir=${rootprefix}/lib/systemd/system-shutdown
|
||||
tmpfilesdir=${prefix}/lib/tmpfiles.d
|
||||
sysusersdir=${prefix}/lib/sysusers.d
|
||||
sysctldir=${prefix}/lib/sysctl.d
|
||||
binfmtdir=${prefix}/lib/binfmt.d
|
||||
modulesloaddir=${prefix}/lib/modules-load.d
|
||||
catalogdir=${prefix}/lib/systemd/catalog
|
||||
systemuidmax=@systemuidmax@
|
||||
systemgidmax=@systemgidmax@
|
||||
dynamicuidmin=@dynamicuidmin@
|
||||
|
Loading…
Reference in New Issue
Block a user