X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=1faa6fe411f83949303e60e3edcb3a692377a495;hb=3840d318011a20960119ff8dff1f67825b2ca0f1;hp=0048f2b63dcdd29d07cd202bc8f9ae7bb71f8d43;hpb=e483478115bce95af6feb2a6174f8308f3f02b7d;p=elogind.git

diff --git a/Makefile.am b/Makefile.am
index 0048f2b63..1faa6fe41 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -266,25 +266,27 @@ src_udevadm_CFLAGS = $(udev_common_CFLAGS)
 src_udevadm_LDADD = $(udev_common_LDADD)
 src_udevadm_CPPFLAGS = $(udev_common_CPPFLAGS)
 
-if HAVE_XSLTPROC
 # ------------------------------------------------------------------------------
 # udev man pages
 # ------------------------------------------------------------------------------
+if ENABLE_MANPAGES
 dist_man_MANS += \
 	src/udev.7 \
 	src/udevadm.8 \
 	src/udevd.8
-
-dist_noinst_DATA = \
-	src/udev.html \
-	src/udevadm.html \
-	src/udevd.html
+endif
 
 EXTRA_DIST += \
 	src/udev.xml \
 	src/udevadm.xml \
 	src/udevd.xml
 
+if HAVE_XSLTPROC
+dist_noinst_DATA = \
+	src/udev.html \
+	src/udevadm.html \
+	src/udevd.html
+
 src/%.7 src/%.8 : src/%.xml
 	$(AM_V_GEN)$(XSLTPROC) -o $@ -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
 
@@ -312,13 +314,12 @@ src_test_udev_SOURCES = \
 src_test_udev_CFLAGS = $(udev_common_CFLAGS)
 src_test_udev_LDADD = $(udev_common_LDADD)
 src_test_udev_CPPFLAGS = $(udev_common_CPPFLAGS)
+src_test_udev_DEPENDENCIES = test/sys
 
 # packed sysfs test tree
-test/sys/kernel/uevent_seqnum:
+test/sys:
 	$(AM_V_GEN)mkdir -p test && tar -C test/ -xJf $(top_srcdir)/test/sys.tar.xz
 
-BUILT_SOURCES += test/sys/kernel/uevent_seqnum
-
 test-sys-distclean:
 	-rm -rf test/sys
 DISTCLEAN_LOCAL_HOOKS += test-sys-distclean
@@ -574,6 +575,7 @@ dist_udevkeymap_DATA = \
 	src/extras/keymap/keymaps/dell \
 	src/extras/keymap/keymaps/dell-latitude-xt2 \
 	src/extras/keymap/keymaps/everex-xt5000 \
+	src/extras/keymap/keymaps/fujitsu-amilo_li_2732 \
 	src/extras/keymap/keymaps/fujitsu-amilo_pa_2548 \
 	src/extras/keymap/keymaps/fujitsu-amilo_pro_edition_v3505 \
 	src/extras/keymap/keymaps/fujitsu-amilo_pro_v3205 \
@@ -769,11 +771,9 @@ git-sync:
 	git push
 	git push --tags
 
-tar:
-	make distcheck
-	xz -d -c udev-$(VERSION).tar.xz | gpg --armor --detach-sign --output udev-$(VERSION).tar.sign
-
 tar-sync:
+	rm -f udev-$(VERSION).tar.sign
+	xz -d -c udev-$(VERSION).tar.xz | gpg --armor --detach-sign --output udev-$(VERSION).tar.sign
 	kup put udev-$(VERSION).tar.xz  udev-$(VERSION).tar.sign /pub/linux/utils/kernel/hotplug/
 
 doc-sync: