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

diff --git a/TODO b/TODO
index e5b4dfba06e87de14b0ca31533ce3dcef7cf2e78..c6576fdaf0a8914c878181fd46dec83257538441 100644 (file)
--- 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)
   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 4bf5bc5f2baea4673519d023cf99d5e1918ea4f8..7247cef5689fbcf7157d62596876e273d6b283fb 100644 (file)
--- 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/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
 
        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
 
 install-data-local:
        -mkdir -p $(DESTDIR)$(sysconfdir)/udev/rules.d