systemctl: properly parse JobNew signals

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 4fd3e6257c7c7ca7784b1d8700262fcbf2f131fb..4e244807c820d2a87eb2b02a8a00f09e2f4e5b39 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -30,18 +30,17 @@ bashcompletiondir=$(sysconfdir)/bash_completion.d
 
 # Our own, non-special dirs
 pkgsysconfdir=$(sysconfdir)/systemd
-userunitdir=$(pkgdatadir)/user
+userunitdir=$(prefix)/lib/systemd/user
 tmpfilesdir=$(sysconfdir)/tmpfiles.d
 usergeneratordir=$(pkglibexecdir)/user-generators
 
 # And these are the special ones for /
 rootdir=@rootdir@
 rootbindir=$(rootdir)/bin
-rootsbindir=$(rootdir)/sbin
 rootlibexecdir=$(rootdir)/lib/systemd
+systemgeneratordir=$(rootlibexecdir)/system-generators
+systemshutdowndir=$(rootlibexecdir)/system-shutdown
 systemunitdir=$(rootdir)/lib/systemd/system
-systemgeneratordir=$(rootdir)/lib/systemd/system-generators
-systemshutdowndir=$(rootdir)/lib/systemd/system-shutdown
 
 AM_CPPFLAGS = \
        -include $(top_builddir)/config.h \
@@ -145,7 +144,7 @@ rootlibexec_PROGRAMS = \
        systemd-ac-power \
        systemd-detect-virt \
        systemd-sysctl \
-        systemd-binfmt
+       systemd-binfmt
 
 systemgenerator_PROGRAMS = \
        systemd-getty-generator
@@ -573,7 +572,8 @@ MANPAGES = \
        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 \
@@ -1129,7 +1129,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' \