build-sys: fix libexecdir to /usr/lib

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 349316aa3ff3956875dfdc81d289d00b204ab97c..ee39cf090eb71c43e8000f332273813c95250bcd 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,6 +17,9 @@
 
 ACLOCAL_AMFLAGS = -I m4
 
+# Override libexecdir
+libexecdir=$(exec_prefix)/lib
+
 # Dirs of external packages
 dbuspolicydir=@dbuspolicydir@
 dbussessionservicedir=@dbussessionservicedir@
@@ -30,7 +33,7 @@ bashcompletiondir=$(sysconfdir)/bash_completion.d
 
 # Our own, non-special dirs
 pkgsysconfdir=$(sysconfdir)/systemd
-userunitdir=$(pkgdatadir)/user
+userunitdir=$(pkglibexecdir)/user
 tmpfilesdir=$(sysconfdir)/tmpfiles.d
 usergeneratordir=$(pkglibexecdir)/user-generators
 
@@ -145,7 +148,7 @@ rootlibexec_PROGRAMS = \
        systemd-ac-power \
        systemd-detect-virt \
        systemd-sysctl \
-        systemd-binfmt
+       systemd-binfmt
 
 systemgenerator_PROGRAMS = \
        systemd-getty-generator
@@ -573,8 +576,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 +1133,9 @@ SED_PROCESS = \
                -e 's,@SYSTEMD_NOTIFY\@,$(rootbindir)/systemd-notify,g' \
                -e 's,@pkgsysconfdir\@,$(pkgsysconfdir),g' \
                -e 's,@pkgdatadir\@,$(pkgdatadir),g' \
+               -e 's,@pkglibexecdir\@,$(pkglibexecdir),g' \
                -e 's,@systemunitdir\@,$(systemunitdir),g' \
+               -e 's,@userunitdir\@,$(userunitdir),g' \
                -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \
                -e 's,@PACKAGE_NAME\@,$(PACKAGE_NAME),g' \
                -e 's,@PACKAGE_URL\@,$(PACKAGE_URL),g' \