summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio 'Flameeyes' Pettenò <flameeyes@gmail.com>2009-08-08 22:12:42 +0200
committerDiego Elio 'Flameeyes' Pettenò <flameeyes@gmail.com>2009-08-08 22:13:25 +0200
commit90b955b8364ed83afb06cfd6a0e8b04d72510b12 (patch)
treee68316d004aacca9baf51c8094a3fa240fac8c3b
parent214a6c791cbc0c1a190c430eb37056087e661344 (diff)
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.
-rw-r--r--Makefile.am2
-rwxr-xr-xextras/keymap/check-keymaps.sh2
2 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am
index c69529780d..221e91f538 100644
--- 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 d4e3e91760..892fcfd6c3 100755
--- 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