rule_generator: use += for dist_udevhome_DATA

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 06500b068b7f0387329fbc8abf0898022a983b8f..83e5fa31d5fb9a82e06b2ac11efcf7eabc718268 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -42,6 +42,7 @@ udevhomedir = $(libexecdir)/udev
 udevhome_SCRIPTS =
 dist_udevhome_SCRIPTS =
 dist_udevhome_DATA =
+dist_man_MANS =
 
 SED_PROCESS = \
        $(AM_V_GEN)$(MKDIR_P) $(dir $@) && $(SED) \
@@ -259,10 +260,11 @@ src_udevadm_CFLAGS = $(udev_common_CFLAGS)
 src_udevadm_LDADD = $(udev_common_LDADD)
 src_udevadm_CPPFLAGS = $(udev_common_CPPFLAGS)
 
+if HAVE_XSLTPROC
 # ------------------------------------------------------------------------------
 # udev man pages
 # ------------------------------------------------------------------------------
-dist_man_MANS = \
+dist_man_MANS += \
        src/udev.7 \
        src/udevadm.8 \
        src/udevd.8
@@ -282,6 +284,7 @@ src/%.7 src/%.8 : src/%.xml
 
 src/%.html : src/%.xml
        $(AM_V_GEN)$(XSLTPROC) -o $@ -nonet http://docbook.sourceforge.net/release/xsl/current/xhtml-1_1/docbook.xsl $<
+endif
 
 # ------------------------------------------------------------------------------
 # udev tests
@@ -655,8 +658,10 @@ dist_udevhome_SCRIPTS += \
        src/extras/rule_generator/write_cd_rules \
        src/extras/rule_generator/write_net_rules
 
-udevhome_DATA = src/extras/rule_generator/rule_generator.functions
 dist_udevhome_DATA += \
+       src/extras/rule_generator/rule_generator.functions
+
+dist_udevrules_DATA += \
        src/extras/rule_generator/75-cd-aliases-generator.rules \
        src/extras/rule_generator/75-persistent-net-generator.rules
 endif
@@ -752,16 +757,16 @@ git-release:
        git tag -m "udev $(VERSION)" -s $(VERSION)
        git gc --prune=0
 
-tar:
-       make distcheck
-       gpg --armor --detach-sign udev-$(VERSION).tar.xz
-
 git-sync:
        git push
        git push --tags $(VERSION)
 
+tar:
+       make distcheck
+       xz -d -c udev-$(VERSION).tar.xz | gpg --armor --detach-sign --output udev-$(VERSION).tar.asc
+
 tar-sync:
-       scp udev-$(VERSION).tar.xz master.kernel.org:/pub/linux/utils/kernel/hotplug/
+       kup put udev-$(VERSION).tar.xz  udev-$(VERSION).tar.asc /pub/linux/utils/kernel/hotplug/udev-$(VERSION).tar.gz
 
 doc-sync:
        rsync -av src/*.html master.kernel.org:/pub/linux/utils/kernel/hotplug/udev/