diff options
| author | Lubomir Rintel <lkundrak@v3.sk> | 2015-01-22 17:31:06 +0100 |
|---|---|---|
| committer | Lubomir Rintel <lkundrak@v3.sk> | 2015-01-22 17:37:56 +0100 |
| commit | 82d1e2658a5fd7d9387df68cb5399b97dcc044d2 (patch) | |
| tree | 0e26144d538c5b75b0a39778e34627262ec5925e | |
| parent | 426c3ac82f1f519656b9fc39c16ca82d749a0b42 (diff) | |
| download | NetworkManager-lr/udev-unmanaged-fd731014-v1.tar.gz | |
data: move OLPC MESH udev rules away from calloutslr/udev-unmanaged-fd731014-v1lr/lr-udev-unmanaged-fd731014
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.
| -rw-r--r-- | callouts/Makefile.am | 6 | ||||
| -rw-r--r-- | data/77-nm-olpc-mesh.rules (renamed from callouts/77-nm-olpc-mesh.rules) | 0 | ||||
| -rw-r--r-- | data/Makefile.am | 5 |
3 files changed, 4 insertions, 7 deletions
diff --git a/callouts/Makefile.am b/callouts/Makefile.am index f682579e91..cc38e01a82 100644 --- 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 index a1a1554c2b..a1a1554c2b 100644 --- a/callouts/77-nm-olpc-mesh.rules +++ b/data/77-nm-olpc-mesh.rules diff --git a/data/Makefile.am b/data/Makefile.am index 194e132ec8..29d8a10e3b 100644 --- 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 = 77-nm-unmanaged.rules +udevrules_DATA = \ + 77-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 \ 77-nm-unmanaged.rules \ + 77-nm-olpc-mesh.rules \ server.conf.in CLEANFILES = \ |