Fix “make distcheck” run outside of the source directory.

Pass the path to keys.txt as second parameter of check-keymaps.sh so that
it can be found in the right path.

diff --git a/Makefile.am b/Makefile.am
index c69529780d8d978a3f012cabe06345c7fa6509aa..221e91f538958c5839563ed5ec367c7e4eaa3749 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -493,7 +493,7 @@ udevacl-install-hook:
        ln -sf $(libexecdir)/udev-acl $(DESTDIR)$(prefix)/lib/ConsoleKit/run-session.d/udev-acl.ck
 
 keymaps-distcheck-hook: extras/keymap/keys.txt
-       ./extras/keymap/check-keymaps.sh $(top_srcdir)
+       $(top_srcdir)/extras/keymap/check-keymaps.sh $(top_srcdir) $^
 
 # ------------------------------------------------------------------------------
 # Custom rules

diff --git a/extras/keymap/check-keymaps.sh b/extras/keymap/check-keymaps.sh
index d4e3e917605b9b50355c755ac9d36ea760d290a6..892fcfd6c34d1fab22da1f87a54cb3b09b01f03e 100755 (executable)
--- a/extras/keymap/check-keymaps.sh
+++ b/extras/keymap/check-keymaps.sh
@@ -4,7 +4,7 @@
 # and that all key maps listed in the rules are valid and present in
 # Makefile.am
 SRCDIR=$1
-KEYLIST=$SRCDIR/extras/keymap/keys.txt
+KEYLIST=$2
 KEYMAPS_DIR=$SRCDIR/extras/keymap/keymaps #extras/keymap/keymaps
 RULES=$SRCDIR/extras/keymap/95-keymap.rules