From: Kay Sievers <kay.sievers@vrfy.org>
Date: Fri, 23 Dec 2011 03:54:08 +0000 (+0100)
Subject: rules: do not preprocess 80-drivers.rules + 75-probe_mtd.rules
X-Git-Tag: 176~45
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=4a9460f15a8ff198d6a9c249bdd63572509e23bb

rules: do not preprocess 80-drivers.rules + 75-probe_mtd.rules
---

diff --git a/Makefile.am b/Makefile.am
index 0064631e4..3e7996fdd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -145,17 +145,9 @@ dist_udevrules_DATA = \
 	rules/rules.d/60-persistent-input.rules \
 	rules/rules.d/60-persistent-alsa.rules \
 	rules/rules.d/60-persistent-storage.rules \
+	rules/rules.d/80-drivers.rules \
 	rules/rules.d/95-udev-late.rules
 
-udevrules_DATA = \
-	rules/rules.d/80-drivers.rules
-
-EXTRA_DIST += \
-	rules/rules.d/80-drivers.rules.in
-
-CLEANFILES += \
-	rules/rules.d/80-drivers.rules
-
 udevconfdir = $(sysconfdir)/udev
 dist_udevconf_DATA = udev.conf
 
@@ -640,10 +632,8 @@ extras_mtd_probe_mtd_probe_SOURCES =  \
 	extras/mtd_probe/mtd_probe.h \
 	extras/mtd_probe/probe_smartmedia.c
 extras_mtd_probe_mtd_probe_CPPFLAGS = $(AM_CPPFLAGS)
-udevrules_DATA += extras/mtd_probe/75-probe_mtd.rules
+dist_udevrules_DATA += extras/mtd_probe/75-probe_mtd.rules
 libexec_PROGRAMS += extras/mtd_probe/mtd_probe
-EXTRA_DIST += extras/mtd_probe/75-probe_mtd.rules.in
-CLEANFILES += extras/mtd_probe/75-probe_mtd.rules
 endif
 
 if ENABLE_RULE_GENERATOR
diff --git a/extras/mtd_probe/.gitignore b/extras/mtd_probe/.gitignore
index 70d3e8310..82b8ab501 100644
--- a/extras/mtd_probe/.gitignore
+++ b/extras/mtd_probe/.gitignore
@@ -1,2 +1 @@
 mtd_probe
-75-probe_mtd.rules
diff --git a/extras/mtd_probe/75-probe_mtd.rules.in b/extras/mtd_probe/75-probe_mtd.rules
similarity index 100%
rename from extras/mtd_probe/75-probe_mtd.rules.in
rename to extras/mtd_probe/75-probe_mtd.rules
diff --git a/rules/.gitignore b/rules/.gitignore
deleted file mode 100644
index 16f9c2daa..000000000
--- a/rules/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-rules.d/80-drivers.rules
diff --git a/rules/rules.d/80-drivers.rules.in b/rules/rules.d/80-drivers.rules
similarity index 100%
rename from rules/rules.d/80-drivers.rules.in
rename to rules/rules.d/80-drivers.rules