From: Kay Sievers <kay.sievers@vrfy.org>
Date: Wed, 17 Jun 2009 16:18:22 +0000 (+0200)
Subject: rules: do not install usb-id/pci-id rules when --disable-extras is used
X-Git-Tag: 174~942
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=0373056e4528f89504cfbf6da97394396005a147

rules: do not install usb-id/pci-id rules when --disable-extras is used
---

diff --git a/TODO b/TODO
index e5b4dfba0..c6576fdaf 100644
--- a/TODO
+++ b/TODO
@@ -1,3 +1,4 @@
+
   o enumerate: sort control* after pcm*
   o add tests for kernel provided DEVNAME logic
   o drop modprobe floppy alias (SUSE), it will be in the module (2.6.30)
diff --git a/rules/Makefile.am b/rules/Makefile.am
index 4bf5bc5f2..7247cef56 100644
--- a/rules/Makefile.am
+++ b/rules/Makefile.am
@@ -7,12 +7,16 @@ dist_udevrules_DATA = \
 	rules.d/60-persistent-serial.rules \
 	rules.d/60-persistent-input.rules \
 	rules.d/60-persistent-alsa.rules \
-	rules.d/75-net-description.rules \
-	rules.d/75-tty-description.rules \
-	rules.d/78-sound-card.rules \
 	rules.d/80-drivers.rules \
 	rules.d/95-udev-late.rules
 
+if ENABLE_EXTRAS
+dist_udevrules_DATA += \
+	rules.d/75-net-description.rules \
+	rules.d/75-tty-description.rules \
+	rules.d/78-sound-card.rules
+endif
+
 install-data-local:
 	-mkdir -p $(DESTDIR)$(sysconfdir)/udev/rules.d