data: move OLPC MESH udev rules away from callouts

No idea why was it there in the first place.

This also fixes a bug that the rules file was conditionally included in dist
depending on presence of udev dir at configure time.

diff --git a/callouts/Makefile.am b/callouts/Makefile.am
index f682579..cc38e01 100644 (file)
--- a/callouts/Makefile.am
+++ b/callouts/Makefile.am
@@ -87,11 +87,6 @@ libtest_dispatcher_envp_la_LIBADD = \
        $(GLIB_LIBS)
 
 
-if WITH_UDEV_DIR
-udevrulesdir = $(UDEV_DIR)/rules.d
-udevrules_DATA = 77-nm-olpc-mesh.rules
-endif
-
 dbusactivationdir = $(datadir)/dbus-1/system-services
 dbusactivation_in_files = org.freedesktop.nm_dispatcher.service.in
 dbusactivation_DATA = $(dbusactivation_in_files:.service.in=.service)
@@ -115,7 +110,6 @@ CLEANFILES = $(nodist_libnmdbus_dispatcher_la_SOURCES) $(dbusactivation_DATA)
 
 EXTRA_DIST = \
        $(dbusservice_DATA) \
-       $(udevrules_DATA) \
        $(dbusactivation_in_files) \
        nm-dispatcher.xml
 

diff --git a/callouts/77-nm-olpc-mesh.rules b/data/77-nm-olpc-mesh.rules
similarity index 100%
rename from callouts/77-nm-olpc-mesh.rules
rename to data/77-nm-olpc-mesh.rules

diff --git a/data/Makefile.am b/data/Makefile.am
index bd40089..5a95ea2 100644 (file)
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -36,7 +36,9 @@ examples_DATA = server.conf
 
 if WITH_UDEV_DIR
 udevrulesdir = $(UDEV_DIR)/rules.d
-udevrules_DATA = 85-nm-unmanaged.rules
+udevrules_DATA = \
+       85-nm-unmanaged.rules \
+       77-nm-olpc-mesh.rules
 endif
 
 server.conf: server.conf.in
@@ -57,6 +59,7 @@ EXTRA_DIST = \
        NetworkManager-dispatcher.service.in \
        org.freedesktop.NetworkManager.service.in \
        85-nm-unmanaged.rules \
+       77-nm-olpc-mesh.rules \
        server.conf.in
 
 CLEANFILES = \