diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-06-01 19:26:04 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-06-01 19:26:04 -0400 |
| commit | e6340af0662d276ec53daccfec5fabeea0982169 (patch) | |
| tree | 0fa3d0ef8009428c7fd9f1a742c01269b87d8c30 /config.mk.in | |
| parent | 801404b19096c117c69c633d46feae35d360d306 (diff) | |
| parent | a83cdb3b2bb21f4e30545ae9ca60f627dfb00c3b (diff) | |
Merge branch 'lukeshu/postmove' into lukeshu/master
# Conflicts:
# build-aux/Makefile.each.tail/20-systemd.mk
Diffstat (limited to 'config.mk.in')
| -rw-r--r-- | config.mk.in | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/config.mk.in b/config.mk.in index 7768f74c6e..f94e107c01 100644 --- a/config.mk.in +++ b/config.mk.in @@ -69,15 +69,15 @@ sysusersdir=$(prefix)/lib/sysusers.d sysctldir=$(prefix)/lib/sysctl.d binfmtdir=$(prefix)/lib/binfmt.d modulesloaddir=$(prefix)/lib/modules-load.d -networkdir=$(rootprefix)/lib/systemd/network +networkdir=$(prefix)/lib/systemd/network pkgincludedir=$(includedir)/systemd -systemgeneratordir=$(rootlibexecdir)/system-generators +systemgeneratordir=$(libexecdir)/system-generators usergeneratordir=$(prefix)/lib/systemd/user-generators -systemshutdowndir=$(rootlibexecdir)/system-shutdown -systemsleepdir=$(rootlibexecdir)/system-sleep -systemunitdir=$(rootprefix)/lib/systemd/system -systempresetdir=$(rootprefix)/lib/systemd/system-preset -udevlibexecdir=$(rootprefix)/lib/udev +systemshutdowndir=$(libexecdir)/system-shutdown +systemsleepdir=$(libexecdir)/system-sleep +systemunitdir=$(prefix)/lib/systemd/system +systempresetdir=$(prefix)/lib/systemd/system-preset +udevlibexecdir=$(prefix)/lib/udev udevhomedir=$(udevlibexecdir) udevrulesdir=$(udevlibexecdir)/rules.d udevhwdbdir=$(udevlibexecdir)/hwdb.d @@ -88,9 +88,9 @@ factory_pamdir = $(datadir)/factory/etc/pam.d bootlibdir = $(prefix)/lib/systemd/boot/efi # And these are the special ones for / -rootprefix=@rootprefix@ -rootbindir=$(rootprefix)/bin -rootlibexecdir=$(rootprefix)/lib/systemd +prefix=@prefix@ +bindir=$(prefix)/bin +libexecdir=$(prefix)/lib/systemd # Libraries we depend on libbasic.CPPFLAGS = -I$(topsrcdir)/src/libbasic -I$(topoutdir)/src/libbasic |