From: Diego Elio 'Flameeyes' Pettenò <flameeyes@gmail.com>
Date: Sat, 8 Aug 2009 20:12:42 +0000 (+0200)
Subject: Fix “make distcheck” run outside of the source directory.
X-Git-Tag: 174~835
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=90b955b8364ed83afb06cfd6a0e8b04d72510b12;hp=214a6c791cbc0c1a190c430eb37056087e661344;p=elogind.git

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 c69529780..221e91f53 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 d4e3e9176..892fcfd6c 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