configure.ac: fix broken firmware search path in configure.ac

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 68a68d9166ab7716082f12d06bbd3286c746a784..7403949cf31948496943a9e9d6ce4450f0fa473e 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -194,6 +194,7 @@ dist_udevrules_DATA += \
 # ------------------------------------------------------------------------------
 extras_firmware_firmware_SOURCES = extras/firmware/firmware.c
 extras_firmware_firmware_LDADD = libudev/libudev-private.la
+extras_firmware_firmware_CPPFLAGS = $(AM_CPPFLAGS) -DFIRMWARE_PATH="$(FIRMWARE_PATH)"
 dist_udevrules_DATA += extras/firmware/50-firmware.rules
 libexec_PROGRAMS = extras/firmware/firmware
 
@@ -540,8 +541,7 @@ dist_udevkeymap_DATA = \
 udevkeymapforcereldir = $(libexecdir)/keymaps/force-release
 dist_udevkeymapforcerel_DATA = \
        extras/keymap/force-release-maps/samsung-other \
-       extras/keymap/force-release-maps/fujitsu-amilo-si1848 \
-       extras/keymap/force-release-maps/dell-studio-1557
+       extras/keymap/force-release-maps/common-volume-keys
 
 extras/keymap/keys.txt: $(INCLUDE_PREFIX)/linux/input.h
        mkdir -p extras/keymap