X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=6e9259be9bcfa1872d7dffd7b2b2ddb4af9dbcf4;hb=0de4f055841fe202a85258a56c67751ccb0f8ee2;hp=e4e3510ddf9d9f255f3d1064fe10b6fc98143b41;hpb=e0d25329b23a43332ea340f9907721873a316f4e;p=elogind.git

diff --git a/Makefile.am b/Makefile.am
index e4e3510dd..6e9259be9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,7 +21,7 @@ ACLOCAL_AMFLAGS = -I m4
 SUBDIRS = po
 
 LIBSYSTEMD_LOGIN_CURRENT=1
-LIBSYSTEMD_LOGIN_REVISION=1
+LIBSYSTEMD_LOGIN_REVISION=2
 LIBSYSTEMD_LOGIN_AGE=1
 
 LIBSYSTEMD_DAEMON_CURRENT=0
@@ -29,11 +29,11 @@ LIBSYSTEMD_DAEMON_REVISION=1
 LIBSYSTEMD_DAEMON_AGE=0
 
 LIBSYSTEMD_ID128_CURRENT=0
-LIBSYSTEMD_ID128_REVISION=1
+LIBSYSTEMD_ID128_REVISION=2
 LIBSYSTEMD_ID128_AGE=0
 
 LIBSYSTEMD_JOURNAL_CURRENT=0
-LIBSYSTEMD_JOURNAL_REVISION=1
+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\" \
@@ -546,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 \
@@ -555,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
@@ -649,6 +651,7 @@ EXTRA_DIST += \
 	src/acl-util.h \
 	src/logs-show.h
 
+if ENABLE_MANPAGES
 MANPAGES = \
 	man/systemd.1 \
 	man/systemctl.1 \
@@ -722,6 +725,8 @@ EXTRA_DIST += \
 	${nodist_man_MANS:=.in} \
 	${XML_IN_FILES:.xml.in=.html.in}
 
+endif
+
 systemd_SOURCES = \
 	src/main.c
 
@@ -860,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
@@ -1126,6 +1135,7 @@ lib_LTLIBRARIES += \
 pkgconfiglib_DATA += \
 	src/libsystemd-daemon.pc
 
+if ENABLE_MANPAGES
 MANPAGES += \
 	man/sd-daemon.7 \
 	man/sd_notify.3 \
@@ -1145,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 \
@@ -1460,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
@@ -1491,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
@@ -1545,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
@@ -2039,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 \
@@ -2080,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 \
@@ -2509,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: