summaryrefslogtreecommitdiff
path: root/data/Makefile.am
diff options
context:
space:
mode:
authorLubomir Rintel <lkundrak@v3.sk>2015-01-22 17:31:06 +0100
committerLubomir Rintel <lkundrak@v3.sk>2015-03-23 15:13:02 +0100
commitceea3c678279a81daa3f28c4e549a7e37f04188e (patch)
treeb2ee0f6d674af5ea3cb0a71ae9ba8bd043cfc239 /data/Makefile.am
parent7ba30cfd265d5cde4afc96685f138cad23921138 (diff)
downloadNetworkManager-ceea3c678279a81daa3f28c4e549a7e37f04188e.tar.gz
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.
Diffstat (limited to 'data/Makefile.am')
-rw-r--r--data/Makefile.am5
1 files changed, 4 insertions, 1 deletions
diff --git a/data/Makefile.am b/data/Makefile.am
index bd40089f6a..5a95ea2a42 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 = 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 = \