diff options
| author | Michael Biebl <biebl@debian.org> | 2015-07-14 19:39:12 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2015-07-14 19:39:12 +0200 |
| commit | 34b1c46437df982495d08a8bbb8bd0b262d8af48 (patch) | |
| tree | 1db29ec39d9f733922b3a33cabcc8e6486fa06aa /data/Makefile.am | |
| parent | 50fc50153b0036516b853aa576dc435bd53ce736 (diff) | |
| parent | 50a58f0fabd8a34c1b6108a107e08abe3c1ccd24 (diff) | |
Merge tag 'upstream/1.0.4'
Upstream version 1.0.4
Diffstat (limited to 'data/Makefile.am')
| -rw-r--r-- | data/Makefile.am | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/data/Makefile.am b/data/Makefile.am index e91361a7..64ff3376 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -34,6 +34,12 @@ endif examplesdir = $(docdir)/examples examples_DATA = server.conf +if WITH_UDEV_DIR +udevrulesdir = $(UDEV_DIR)/rules.d +udevrules_DATA = \ + 85-nm-unmanaged.rules +endif + server.conf: server.conf.in $(edit) $< >$@ @@ -51,6 +57,7 @@ EXTRA_DIST = \ NetworkManager-wait-online-systemd-pre200.service.in \ NetworkManager-dispatcher.service.in \ org.freedesktop.NetworkManager.service.in \ + 85-nm-unmanaged.rules \ server.conf.in CLEANFILES = \ |