X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=bad55aacf0c8455ea17ecb2c0e13a4183dce15d7;hb=81e0d95604bbdd884aa003de155d5a40debd071d;hp=eda338a320e41b417ea7f60d6e65e694221680bc;hpb=204fa33c82588c47ebeef3f8c4c0b7da750e37f7;p=elogind.git

diff --git a/Makefile.am b/Makefile.am
index eda338a32..bad55aacf 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,9 +20,9 @@ ACLOCAL_AMFLAGS = -I m4
 
 SUBDIRS = po
 
-LIBSYSTEMD_LOGIN_CURRENT=1
-LIBSYSTEMD_LOGIN_REVISION=2
-LIBSYSTEMD_LOGIN_AGE=1
+LIBSYSTEMD_LOGIN_CURRENT=2
+LIBSYSTEMD_LOGIN_REVISION=0
+LIBSYSTEMD_LOGIN_AGE=2
 
 LIBSYSTEMD_DAEMON_CURRENT=0
 LIBSYSTEMD_DAEMON_REVISION=1
@@ -651,7 +651,6 @@ EXTRA_DIST += \
 	src/acl-util.h \
 	src/logs-show.h
 
-if ENABLE_MANPAGES
 MANPAGES = \
 	man/systemd.1 \
 	man/systemctl.1 \
@@ -700,6 +699,7 @@ man/reboot.8: man/halt.8
 man/poweroff.8: man/halt.8
 man/init.1: man/systemd.1
 
+if ENABLE_MANPAGES
 dist_man_MANS = \
 	$(MANPAGES) \
 	$(MANPAGES_ALIAS)
@@ -724,7 +724,6 @@ EXTRA_DIST += \
 	$(XML_IN_FILES) \
 	${nodist_man_MANS:=.in} \
 	${XML_IN_FILES:.xml.in=.html.in}
-
 endif
 
 systemd_SOURCES = \
@@ -1135,7 +1134,6 @@ lib_LTLIBRARIES += \
 pkgconfiglib_DATA += \
 	src/libsystemd-daemon.pc
 
-if ENABLE_MANPAGES
 MANPAGES += \
 	man/sd-daemon.7 \
 	man/sd_notify.3 \
@@ -1155,7 +1153,6 @@ 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 \
@@ -1471,10 +1468,8 @@ 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
@@ -1504,10 +1499,8 @@ 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
@@ -1560,12 +1553,10 @@ 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
@@ -2056,7 +2047,6 @@ 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 \
@@ -2074,6 +2064,10 @@ MANPAGES_ALIAS += \
 	man/sd_login_monitor_get_fd.3 \
 	man/sd_session_get_uid.3 \
 	man/sd_session_get_seat.3 \
+	man/sd_session_get_service.3 \
+	man/sd_session_get_type.3 \
+	man/sd_session_get_class.3 \
+	man/sd_session_get_display.3 \
 	man/sd_pid_get_owner_uid.3 \
 	man/sd_pid_get_unit.3 \
 	man/sd_uid_is_on_seat.3 \
@@ -2089,6 +2083,10 @@ man/sd_login_monitor_flush.3: man/sd_login_monitor_new.3
 man/sd_login_monitor_get_fd.3: man/sd_login_monitor_new.3
 man/sd_session_get_uid.3: man/sd_session_is_active.3
 man/sd_session_get_seat.3: man/sd_session_is_active.3
+man/sd_session_get_service.3: man/sd_session_is_active.3
+man/sd_session_get_type.3: man/sd_session_is_active.3
+man/sd_session_get_class.3: man/sd_session_is_active.3
+man/sd_session_get_display.3: man/sd_session_is_active.3
 man/sd_pid_get_owner_uid.3: man/sd_pid_get_session.3
 man/sd_pid_get_unit.3: man/sd_pid_get_session.3
 man/sd_uid_is_on_seat.3: man/sd_uid_get_state.3
@@ -2098,7 +2096,6 @@ 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 \
@@ -2528,11 +2525,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: