From b396e02c4300b3797b651656b5602b82feb9b7bc Mon Sep 17 00:00:00 2001
From: "Anthony G. Basile" <blueness@gentoo.org>
Date: Thu, 22 Nov 2012 21:51:53 -0500
Subject: Fix keymap test during make distcheck

The keys/keymap test preformed by src/keymap/check-keymaps.sh must
find both keys.txt and the keymap directory.  When building out of
the source tree, eg when doing `make distcheck`, these are located
at ${top_builddir}/src/keymap/keys.txt and ${top_srcdir}/keymap/,
respectively.  This patch fixes the build so that these are now
correctly found.

Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
---
 src/keymap/check-keymaps.sh             | 41 ------------------------------
 src/keymap/check-keymaps.sh.in          | 45 +++++++++++++++++++++++++++++++++
 src/keymap/keyboard-force-release.sh.in |  0
 3 files changed, 45 insertions(+), 41 deletions(-)
 delete mode 100755 src/keymap/check-keymaps.sh
 create mode 100644 src/keymap/check-keymaps.sh.in
 mode change 100755 => 100644 src/keymap/keyboard-force-release.sh.in

(limited to 'src/keymap')

diff --git a/src/keymap/check-keymaps.sh b/src/keymap/check-keymaps.sh
deleted file mode 100755
index e3abe672d1..0000000000
--- a/src/keymap/check-keymaps.sh
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/bash
-
-# check that all key names in keymaps/* are known in <linux/input.h>
-# and that all key maps listed in the rules are valid and present in
-# Makefile.am
-
-SRCDIR=${1:-../..}
-KEYLIST=${2:-${SRCDIR}/src/keymap/keys.txt}
-
-[ -e "$KEYLIST" ] || {
-        echo "need $KEYLIST please build first" >&2
-        exit 1
-}
-
-KEYMAPS_DIR=${SRCDIR}/keymaps
-KEYMAPS_LIST=$(ls ${KEYMAPS_DIR}/* | grep -v Makefile)
-RULES=${SRCDIR}/rules/95-keymap.rules
-
-missing=$(join -v 2 <(awk '{print tolower(substr($1,5))}' $KEYLIST | sort -u) \
-                    <(grep -hv '^#' ${KEYMAPS_LIST}| awk '{print $2}' | sort -u))
-[ -z "$missing" ] || {
-        echo "ERROR: unknown key names in keymaps/*:" >&2
-        echo "$missing" >&2
-        exit 1
-}
-
-# check that all maps referred to in $RULES exist
-maps=$(sed -rn '/keymap \$name/ { s/^.*\$name ([^"[:space:]]+).*$/\1/; p }' $RULES)
-for m in $maps; do
-        # ignore inline mappings
-        [ "$m" = "${m#0x}" ] || continue
-
-        [ -e ${KEYMAPS_DIR}/$m ] || {
-                echo "ERROR: unknown map name in $RULES: $m" >&2
-                exit 1
-        }
-        grep -q "$m\>" ${SRCDIR}/keymaps/Makefile.am || {
-                echo "ERROR: map file $m is not added to Makefile.am" >&2
-                exit 1
-        }
-done
diff --git a/src/keymap/check-keymaps.sh.in b/src/keymap/check-keymaps.sh.in
new file mode 100644
index 0000000000..a62b48d4d5
--- /dev/null
+++ b/src/keymap/check-keymaps.sh.in
@@ -0,0 +1,45 @@
+#!/bin/bash
+
+# check that all key names in keymaps/* are known in <linux/input.h>
+# and that all key maps listed in the rules are valid and present in
+# Makefile.am
+
+top_srcdir=@top_srcdir@
+top_builddir=@top_builddir@
+
+SRCDIR=${1:-${top_srcdir}}
+BUILDDIR=${1:-${top_builddir}}
+KEYLIST=${2:-${BUILDDIR}/src/keymap/keys.txt}
+
+KEYMAPS_DIR=${SRCDIR}/keymaps
+KEYMAPS_LIST=$(ls ${KEYMAPS_DIR}/* | grep -v Makefile)
+RULES=${SRCDIR}/rules/95-keymap.rules
+
+[ -e "$KEYLIST" ] || {
+        echo "need $KEYLIST please build first" >&2
+        exit 1
+}
+
+missing=$(join -v 2 <(awk '{print tolower(substr($1,5))}' $KEYLIST | sort -u) \
+                    <(grep -hv '^#' ${KEYMAPS_LIST}| awk '{print $2}' | sort -u))
+[ -z "$missing" ] || {
+        echo "ERROR: unknown key names in keymaps/*:" >&2
+        echo "$missing" >&2
+        exit 1
+}
+
+# check that all maps referred to in $RULES exist
+maps=$(sed -rn '/keymap \$name/ { s/^.*\$name ([^"[:space:]]+).*$/\1/; p }' $RULES)
+for m in $maps; do
+        # ignore inline mappings
+        [ "$m" = "${m#0x}" ] || continue
+
+        [ -e ${KEYMAPS_DIR}/$m ] || {
+                echo "ERROR: unknown map name in $RULES: $m" >&2
+                exit 1
+        }
+        grep -q "$m\>" ${SRCDIR}/keymaps/Makefile.am || {
+                echo "ERROR: map file $m is not added to Makefile.am" >&2
+                exit 1
+        }
+done
diff --git a/src/keymap/keyboard-force-release.sh.in b/src/keymap/keyboard-force-release.sh.in
old mode 100755
new mode 100644
-- 
cgit v1.2.3-54-g00ecf