build-sys: always place user units in /usr/lib/systemd

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 4fd3e6257c7c7ca7784b1d8700262fcbf2f131fb..ca027b62b356ee8957b415fd1130e6a68d43a9be 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -30,7 +30,7 @@ bashcompletiondir=$(sysconfdir)/bash_completion.d
 
 # Our own, non-special dirs
 pkgsysconfdir=$(sysconfdir)/systemd
 
 # Our own, non-special dirs
 pkgsysconfdir=$(sysconfdir)/systemd

-userunitdir=$(pkgdatadir)/user
+userunitdir=$(pkglibexecdir)/user

 tmpfilesdir=$(sysconfdir)/tmpfiles.d
 usergeneratordir=$(pkglibexecdir)/user-generators
 
 tmpfilesdir=$(sysconfdir)/tmpfiles.d
 usergeneratordir=$(pkglibexecdir)/user-generators
 


@@ -145,7 +145,7 @@ rootlibexec_PROGRAMS = \
        systemd-ac-power \
        systemd-detect-virt \
        systemd-sysctl \
        systemd-ac-power \
        systemd-detect-virt \
        systemd-sysctl \

-        systemd-binfmt
+       systemd-binfmt

 
 systemgenerator_PROGRAMS = \
        systemd-getty-generator
 
 systemgenerator_PROGRAMS = \
        systemd-getty-generator


@@ -573,7 +573,8 @@ MANPAGES = \
        man/locale.conf.5 \
        man/os-release.5 \
        man/modules-load.d.5 \
        man/locale.conf.5 \
        man/os-release.5 \
        man/modules-load.d.5 \

-        man/binfmt.d.5
+       man/binfmt.d.5 \
+       man/sysctl.d.5

 
 MANPAGES_ALIAS = \
        man/reboot.8 \
 
 MANPAGES_ALIAS = \
        man/reboot.8 \


@@ -1129,7 +1130,9 @@ SED_PROCESS = \
                -e 's,@SYSTEMD_NOTIFY\@,$(rootbindir)/systemd-notify,g' \
                -e 's,@pkgsysconfdir\@,$(pkgsysconfdir),g' \
                -e 's,@pkgdatadir\@,$(pkgdatadir),g' \
                -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,@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' \
                -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \
                -e 's,@PACKAGE_NAME\@,$(PACKAGE_NAME),g' \
                -e 's,@PACKAGE_URL\@,$(PACKAGE_URL),g' \