udev-acl: skip ACLs when systemd is running, disable by default

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 0b670d53404d4b422ad25bfdb81409453390f626..d2e9b855fe16a813ad95edde2a3511fcf4a0d120 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -277,6 +277,7 @@ extras_scsi_id_scsi_id_SOURCES =\
 extras_scsi_id_scsi_id_LDADD = libudev/libudev-private.la
 libexec_PROGRAMS += extras/scsi_id/scsi_id
 dist_man_MANS += extras/scsi_id/scsi_id.8
+EXTRA_DIST += extras/scsi_id/README
 
 # ------------------------------------------------------------------------------
 # usb_id - USB device property import
@@ -359,7 +360,7 @@ if ENABLE_UDEV_ACL
 extras_udev_acl_udev_acl_SOURCES = extras/udev-acl/udev-acl.c
 extras_udev_acl_udev_acl_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS)
 extras_udev_acl_udev_acl_LDADD = libudev/libudev-private.la -lacl $(GLIB_LIBS)
-dist_udevrules_DATA += extras/udev-acl/70-acl.rules
+dist_udevrules_DATA += extras/udev-acl/70-udev-acl.rules
 libexec_PROGRAMS += extras/udev-acl/udev-acl
 
 udevacl-install-hook:
@@ -437,7 +438,10 @@ EXTRA_DIST += \
        extras/gudev/COPYING \
        extras/gudev/gudevmarshal.list \
        extras/gudev/gudevenumtypes.h.template \
-       extras/gudev/gudevenumtypes.c.template
+       extras/gudev/gudevenumtypes.c.template \
+       extras/gudev/gjs-example.js \
+       extras/gudev/seed-example-enum.js \
+       extras/gudev/seed-example.js
 
 extras/gudev/gudevmarshal.h: extras/gudev/gudevmarshal.list
        $(AM_V_GEN)glib-genmarshal $< --prefix=g_udev_marshal --header > $@
@@ -694,7 +698,7 @@ git-sync:
        git push --tags $(VERSION)
 
 tar-sync:
-       scp udev-$(VERSION).gz master.kernel.org:/pub/linux/utils/kernel/hotplug/
+       scp udev-$(VERSION).tar.gz master.kernel.org:/pub/linux/utils/kernel/hotplug/
 
 doc-sync:
        rsync -av udev/*.html master.kernel.org:/pub/linux/utils/kernel/hotplug/udev/