summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKay Sievers <kay.sievers@vrfy.org>2011-12-23 03:23:37 +0100
committerKay Sievers <kay.sievers@vrfy.org>2011-12-23 03:23:37 +0100
commit009cc08c7b85bc6d69145a4b1efd7be534da1b45 (patch)
treeea2ce0ef8a464e20ad5c06c2e7a8056643415d3b
parent7c2dee4a4d7f1b264031daaee786a8fe429884e1 (diff)
rules: do not preprocess 60-persistent-storage.rules
-rw-r--r--Makefile.am8
-rw-r--r--rules/.gitignore1
-rw-r--r--rules/rules.d/60-persistent-storage.rules (renamed from rules/rules.d/60-persistent-storage.rules.in)0
3 files changed, 3 insertions, 6 deletions
diff --git a/Makefile.am b/Makefile.am
index eb9ee93135..0064631e44 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -144,19 +144,17 @@ dist_udevrules_DATA = \
rules/rules.d/60-persistent-serial.rules \
rules/rules.d/60-persistent-input.rules \
rules/rules.d/60-persistent-alsa.rules \
+ rules/rules.d/60-persistent-storage.rules \
rules/rules.d/95-udev-late.rules
udevrules_DATA = \
- rules/rules.d/60-persistent-storage.rules \
rules/rules.d/80-drivers.rules
EXTRA_DIST += \
- rules/rules.d/80-drivers.rules.in \
- rules/rules.d/60-persistent-storage.rules.in
+ rules/rules.d/80-drivers.rules.in
CLEANFILES += \
- rules/rules.d/80-drivers.rules \
- rules/rules.d/60-persistent-storage.rules
+ rules/rules.d/80-drivers.rules
udevconfdir = $(sysconfdir)/udev
dist_udevconf_DATA = udev.conf
diff --git a/rules/.gitignore b/rules/.gitignore
index 7240bd79d6..16f9c2daa8 100644
--- a/rules/.gitignore
+++ b/rules/.gitignore
@@ -1,2 +1 @@
-rules.d/60-persistent-storage.rules
rules.d/80-drivers.rules
diff --git a/rules/rules.d/60-persistent-storage.rules.in b/rules/rules.d/60-persistent-storage.rules
index 9b340334f4..9b340334f4 100644
--- a/rules/rules.d/60-persistent-storage.rules.in
+++ b/rules/rules.d/60-persistent-storage.rules