build-sys: do not use split-/usr in distcheck

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index d6fcd23823fccd9cc9bb7ec58da32750009a9717..6e9259be9bcfa1872d7dffd7b2b2ddb4af9dbcf4 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,19 +21,19 @@ ACLOCAL_AMFLAGS = -I m4
 SUBDIRS = po
 
 LIBSYSTEMD_LOGIN_CURRENT=1
-LIBSYSTEMD_LOGIN_REVISION=0
+LIBSYSTEMD_LOGIN_REVISION=2
 LIBSYSTEMD_LOGIN_AGE=1
 
 LIBSYSTEMD_DAEMON_CURRENT=0
-LIBSYSTEMD_DAEMON_REVISION=0
+LIBSYSTEMD_DAEMON_REVISION=1
 LIBSYSTEMD_DAEMON_AGE=0
 
 LIBSYSTEMD_ID128_CURRENT=0
-LIBSYSTEMD_ID128_REVISION=0
+LIBSYSTEMD_ID128_REVISION=2
 LIBSYSTEMD_ID128_AGE=0
 
 LIBSYSTEMD_JOURNAL_CURRENT=0
-LIBSYSTEMD_JOURNAL_REVISION=0
+LIBSYSTEMD_JOURNAL_REVISION=2
 LIBSYSTEMD_JOURNAL_AGE=0
 
 # Dirs of external packages
@@ -86,7 +86,7 @@ AM_CPPFLAGS = \
        -DUSER_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/user\" \
        -DUSER_DATA_UNIT_PATH=\"$(userunitdir)\" \
        -DSYSTEMD_CGROUP_AGENT_PATH=\"$(rootlibexecdir)/systemd-cgroups-agent\" \
-       -DSYSTEMD_BINARY_PATH=\"$(rootbindir)/systemd\" \
+       -DSYSTEMD_BINARY_PATH=\"$(rootlibexecdir)/systemd\" \
        -DSYSTEMD_SHUTDOWN_BINARY_PATH=\"$(rootlibexecdir)/systemd-shutdown\" \
        -DSYSTEMCTL_BINARY_PATH=\"$(rootbindir)/systemctl\" \
        -DSYSTEMD_TTY_ASK_PASSWORD_AGENT_BINARY_PATH=\"$(rootbindir)/systemd-tty-ask-password-agent\" \
@@ -161,7 +161,6 @@ endif
 endif
 
 rootbin_PROGRAMS = \
-       systemd \
        systemctl \
        systemd-notify \
        systemd-ask-password \
@@ -185,6 +184,7 @@ bin_PROGRAMS += \
 endif
 
 rootlibexec_PROGRAMS = \
+       systemd \
        systemd-cgroups-agent \
        systemd-initctl \
        systemd-update-utmp \
@@ -432,6 +432,7 @@ endif
 
 dist_doc_DATA = \
        README \
+        NEWS \
        LICENSE \
        DISTRO_PORTING
 
@@ -545,7 +546,8 @@ libsystemd_core_la_CFLAGS = \
        $(UDEV_CFLAGS) \
        $(LIBWRAP_CFLAGS) \
        $(PAM_CFLAGS) \
-       $(AUDIT_CFLAGS)
+       $(AUDIT_CFLAGS) \
+       $(KMOD_CFLAGS)
 
 libsystemd_core_la_LIBADD = \
        libsystemd-basic.la \
@@ -554,7 +556,8 @@ libsystemd_core_la_LIBADD = \
        $(LIBWRAP_LIBS) \
        $(PAM_LIBS) \
        $(AUDIT_LIBS) \
-       $(CAP_LIBS)
+       $(CAP_LIBS) \
+       $(KMOD_LIBS)
 
 # This is needed because automake is buggy in how it generates the
 # rules for C programs, but not Vala programs. We therefore can't
@@ -648,11 +651,13 @@ EXTRA_DIST += \
        src/acl-util.h \
        src/logs-show.h
 
+if ENABLE_MANPAGES
 MANPAGES = \
        man/systemd.1 \
        man/systemctl.1 \
        man/systemadm.1 \
        man/systemd-cgls.1 \
+       man/systemd-cgtop.1 \
        man/systemd-nspawn.1 \
        man/systemd-tmpfiles.8 \
        man/systemd-notify.1 \
@@ -720,6 +725,8 @@ EXTRA_DIST += \
        ${nodist_man_MANS:=.in} \
        ${XML_IN_FILES:.xml.in=.html.in}
 
+endif
+
 systemd_SOURCES = \
        src/main.c
 
@@ -858,8 +865,12 @@ systemd_shutdown_LDADD = \
 systemd_modules_load_SOURCES = \
        src/modules-load.c
 
+systemd_modules_load_CFLAGS = \
+       $(KMOD_CFLAGS)
+
 systemd_modules_load_LDADD = \
-       libsystemd-basic.la
+       libsystemd-basic.la \
+       $(KMOD_LIBS)
 
 systemd_tmpfiles_SOURCES = \
        src/tmpfiles.c
@@ -1124,6 +1135,7 @@ lib_LTLIBRARIES += \
 pkgconfiglib_DATA += \
        src/libsystemd-daemon.pc
 
+if ENABLE_MANPAGES
 MANPAGES += \
        man/sd-daemon.7 \
        man/sd_notify.3 \
@@ -1143,6 +1155,7 @@ man/sd_is_socket_unix.3: man/sd_is_fifo.3
 man/sd_is_socket_inet.3: man/sd_is_fifo.3
 man/sd_is_mq.3: man/sd_is_fifo.3
 man/sd_notifyf.3: man/sd_notify.3
+endif
 
 EXTRA_DIST += \
        src/libsystemd-daemon.pc.in \
@@ -1458,8 +1471,10 @@ binfmt-install-data-hook:
 INSTALL_DATA_HOOKS += \
        binfmt-install-data-hook
 
+if ENABLE_MANPAGES
 MANPAGES += \
        man/binfmt.d.5
+endif
 
 EXTRA_DIST += \
        units/systemd-binfmt.service.in
@@ -1489,8 +1504,10 @@ vconsole-install-data-hook:
 INSTALL_DATA_HOOKS += \
        vconsole-install-data-hook
 
+if ENABLE_MANPAGES
 MANPAGES += \
        man/vconsole.conf.5
+endif
 
 EXTRA_DIST += \
        units/systemd-vconsole-setup.service.in
@@ -1543,10 +1560,12 @@ EXTRA_DIST += \
        units/systemd-readahead-replay.service.in \
        units/systemd-readahead-done.service.in
 
+if ENABLE_MANPAGES
 MANPAGES += \
        man/sd_readahead.3 \
        man/sd-readahead.7
 endif
+endif
 
 # ------------------------------------------------------------------------------
 if ENABLE_QUOTACHECK
@@ -1977,7 +1996,8 @@ polkitpolicy_in_files += \
 
 logind-install-data-hook:
        $(MKDIR_P) -m 0755 \
-               $(DESTDIR)$(systemunitdir)/multi-user.target.wants
+               $(DESTDIR)$(systemunitdir)/multi-user.target.wants \
+                $(DESTDIR)$(localstatedir)/lib/systemd
        ( cd $(DESTDIR)$(systemunitdir) && \
                rm -f dbus-org.freedesktop.login1.service && \
                $(LN_S) systemd-logind.service dbus-org.freedesktop.login1.service)
@@ -2036,6 +2056,7 @@ dist_udevrules_DATA += \
 nodist_udevrules_DATA += \
        src/login/73-seat-late.rules
 
+if ENABLE_MANPAGES
 MANPAGES += \
        man/systemd-logind.conf.5 \
        man/sd-login.7 \
@@ -2077,6 +2098,7 @@ man/sd_seat_get_sessions.3: man/sd_seat_get_active.3
 man/sd_seat_can_multi_session.3: man/sd_seat_get_active.3
 man/sd_get_sessions.3: man/sd_get_seats.3
 man/sd_get_uids.3: man/sd_get_seats.3
+endif
 
 EXTRA_DIST += \
        src/login/logind-gperf.gperf \
@@ -2506,11 +2528,13 @@ DISTCHECK_CONFIGURE_FLAGS = \
        --with-dbusinterfacedir=$$dc_install_base/$(dbusinterfacedir) \
        --with-udevrulesdir=$$dc_install_base/$(udevrulesdir) \
        --with-pamlibdir=$$dc_install_base/$(pamlibdir) \
-       --with-rootprefix=$$dc_install_base/$(rootprefix)
+       --with-rootprefix=$$dc_install_base/$(prefix)
+
 
 upload: all distcheck
        cp -v systemd-$(VERSION).tar.xz /home/lennart/git.fedora/systemd/
        scp systemd-$(VERSION).tar.xz fdo:/srv/www.freedesktop.org/www/software/systemd/
+       scp man/*.html fdo:/srv/www.freedesktop.org/www/software/systemd/man/
        scp man/*.html tango:public/systemd-man/
 
 git-tag: