summaryrefslogtreecommitdiff
path: root/Makefile.am
diff options
context:
space:
mode:
authorKay Sievers <kay.sievers@vrfy.org>2011-04-05 02:19:42 +0200
committerKay Sievers <kay.sievers@vrfy.org>2011-04-05 02:19:42 +0200
commit61fbbab8697ec62cdedc08efdbb8da1c875ce2a1 (patch)
treea312f5b374c4339c5975788407430cfdc13236d8 /Makefile.am
parentcdee58bd382df3dffb103b45c848aa759ff73881 (diff)
build-sys: always place user units in /usr/lib/systemd
./configure --libexecdir=/usr/lib
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am10
1 files changed, 5 insertions, 5 deletions
diff --git a/Makefile.am b/Makefile.am
index efc969cca3..ca027b62b3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -30,7 +30,7 @@ bashcompletiondir=$(sysconfdir)/bash_completion.d
# Our own, non-special dirs
pkgsysconfdir=$(sysconfdir)/systemd
-userunitdir=$(pkglibdir)/user
+userunitdir=$(pkglibexecdir)/user
tmpfilesdir=$(sysconfdir)/tmpfiles.d
usergeneratordir=$(pkglibexecdir)/user-generators
@@ -145,7 +145,7 @@ rootlibexec_PROGRAMS = \
systemd-ac-power \
systemd-detect-virt \
systemd-sysctl \
- systemd-binfmt
+ systemd-binfmt
systemgenerator_PROGRAMS = \
systemd-getty-generator
@@ -573,8 +573,8 @@ MANPAGES = \
man/locale.conf.5 \
man/os-release.5 \
man/modules-load.d.5 \
- man/binfmt.d.5 \
- man/sysctl.d.5
+ man/binfmt.d.5 \
+ man/sysctl.d.5
MANPAGES_ALIAS = \
man/reboot.8 \
@@ -1130,7 +1130,7 @@ SED_PROCESS = \
-e 's,@SYSTEMD_NOTIFY\@,$(rootbindir)/systemd-notify,g' \
-e 's,@pkgsysconfdir\@,$(pkgsysconfdir),g' \
-e 's,@pkgdatadir\@,$(pkgdatadir),g' \
- -e 's,@pkglibdir\@,$(pkglibdir),g' \
+ -e 's,@pkglibexecdir\@,$(pkglibexecdir),g' \
-e 's,@systemunitdir\@,$(systemunitdir),g' \
-e 's,@userunitdir\@,$(userunitdir),g' \
-e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \