require 2.6.27 for proper signalfd handling

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 604a33bc3a4297fdae94f3501d9c26522093c5b6..61fbf222cbc7adab14e3e7ce3a186149640bb5f1 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -280,17 +280,17 @@ extras_v4l_id_v4l_id_LDADD = libudev/libudev-private.la
 libexec_PROGRAMS += extras/v4l_id/v4l_id
 dist_udevrules_DATA += extras/v4l_id/60-persistent-v4l.rules
 
+if ENABLE_EXTRAS
 # ------------------------------------------------------------------------------
 # conditional extras (need glib, libusb, libacl, ...)
 # ------------------------------------------------------------------------------
-if ENABLE_EXTRAS
 dist_udevrules_DATA += \
        rules/rules.d/75-net-description.rules \
        rules/rules.d/75-tty-description.rules \
        rules/rules.d/78-sound-card.rules
 
 # ------------------------------------------------------------------------------
-# GUdev
+# GUdev - libudev gobject interface
 # ------------------------------------------------------------------------------
 LIBGUDEV_CURRENT=0
 LIBGUDEV_REVISION=1
@@ -439,7 +439,7 @@ libexec_PROGRAMS += extras/usb-db/usb-db
 # pci-db - read PCI vendor/device string database
 # ------------------------------------------------------------------------------
 extras_usb_db_pci_db_SOURCES = extras/usb-db/usb-db.c
-extras_usb_db_pci_db_CPPFLAGS = $(AM_CPPFLAGS) -DPCI_DATABASE=\"$(USB_DATABASE)\" -DBUILD_FOR_PCI
+extras_usb_db_pci_db_CPPFLAGS = $(AM_CPPFLAGS) -DPCI_DATABASE=\"$(PCI_DATABASE)\" -DBUILD_FOR_PCI
 extras_usb_db_pci_db_LDADD = libudev/libudev-private.la
 libexec_PROGRAMS += extras/usb-db/pci-db
 
@@ -487,6 +487,7 @@ udevkeymapdir = $(libexecdir)/keymaps
 dist_udevkeymap_DATA = \
        extras/keymap/keymaps/acer \
        extras/keymap/keymaps/acer-aspire_5920g \
+       extras/keymap/keymaps/acer-aspire_6920 \
        extras/keymap/keymaps/acer-travelmate_c300 \
        extras/keymap/keymaps/asus \
        extras/keymap/keymaps/compaq-e_evo \