diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-06-13 13:02:56 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-06-13 13:02:56 -0400 |
| commit | 1fb680e2214b43024d929760c09dd176983d499a (patch) | |
| tree | 0de6c3d936285dbbb197961c53d8fc7ef150a103 /build-aux/Makefile.once.head | |
| parent | 30e337e22d0bbf25150d8a795f6e41d17edb2a74 (diff) | |
| parent | 719a2130b6cb5535f8368db270649d1a499985bd (diff) | |
Merge branch 'lukeshu/postmove' into lukeshu/master
# Conflicts:
# config.mk.in
Diffstat (limited to 'build-aux/Makefile.once.head')
| -rw-r--r-- | build-aux/Makefile.once.head/20-systemd.mk | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/build-aux/Makefile.once.head/20-systemd.mk b/build-aux/Makefile.once.head/20-systemd.mk index 87a8e3bf0b..8745e8bb18 100644 --- a/build-aux/Makefile.once.head/20-systemd.mk +++ b/build-aux/Makefile.once.head/20-systemd.mk @@ -119,11 +119,11 @@ INTLTOOL_V_MERGE_0 = @echo " ITMRG " $@; INTLTOOL_V_MERGE_1 = substitutions = \ - '|libexecdir=$(libexecdir)|' \ + '|rootlibexecdir=$(rootlibexecdir)|' \ + '|rootbindir=$(rootbindir)|' \ '|bindir=$(bindir)|' \ - '|bindir=$(bindir)|' \ - '|SYSTEMCTL=$(bindir)/systemctl|' \ - '|SYSTEMD_NOTIFY=$(bindir)/systemd-notify|' \ + '|SYSTEMCTL=$(rootbindir)/systemctl|' \ + '|SYSTEMD_NOTIFY=$(rootbindir)/systemd-notify|' \ '|pkgsysconfdir=$(pkgsysconfdir)|' \ '|SYSTEM_CONFIG_UNIT_PATH=$(pkgsysconfdir)/system|' \ '|USER_CONFIG_UNIT_PATH=$(pkgsysconfdir)/user|' \ @@ -151,7 +151,7 @@ substitutions = \ '|libdir=$(libdir)|' \ '|includedir=$(includedir)|' \ '|VERSION=$(VERSION)|' \ - '|prefix=$(prefix)|' \ + '|rootprefix=$(rootprefix)|' \ '|udevlibexecdir=$(udevlibexecdir)|' \ '|SUSHELL=$(SUSHELL)|' \ '|SULOGIN=$(SULOGIN)|' \ |