Fix distcheck

Signed-off-by: Alexey Gladkov <gladkov.alexey@gmail.com>

diff --git a/src/libkeymap/Makefile.am b/src/libkeymap/Makefile.am
index 1e63a68..b4dfcce 100644 (file)
--- a/src/libkeymap/Makefile.am
+++ b/src/libkeymap/Makefile.am
@@ -8,6 +8,7 @@ EXTRA_DIST =
 
 headers = \
        keymap.h \
+       keymap/array.h \
        keymap/context.h \
        keymap/charset.h \
        keymap/common.h \
@@ -75,4 +76,4 @@ analyze.h: analyze.c ; @true
            -e 's,[@]includedir[@],$(includedir),g' \
            <$< >$(builddir)/$@
        touch -r $< $(builddir)/$@
-       chmod --reference=$< $(builddir)/$@
+       chmod 644 $(builddir)/$@

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 412f690..e7d22c2 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -7,6 +7,7 @@ AM_CFLAGS = $(CHECK_CFLAGS)
 LDADD  = $(top_builddir)/src/libkeymap/libkeymap.la $(CHECK_LIBS)
 
 EXTRA_DIST = \
+       dumpkeys-bkeymap.in \
        dumpkeys-fulltable.in \
        dumpkeys-mktable.in \
        \
@@ -16,7 +17,10 @@ EXTRA_DIST = \
        dumpkeys.ua-ws.map \
        include40.map include41.map \
        keymap0.map keymap1.map keymap2.map keymap3.map keymap4.map keymap5.map keymap6.map \
-       VoidSymbol.map
+       VoidSymbol.map \
+       \
+       dumpkeys.bkeymap.bin \
+       dumpkeys.defkeymap.c
 
 check_SCRIPTS  = dumpkeys-fulltable dumpkeys-mktable dumpkeys-bkeymap
 check_PROGRAMS = libkeymap-init libkeymap-kmap libkeymap-keys libkeymap-parse \
@@ -45,4 +49,4 @@ libkeymap_bkeymap_SOURCES  = libkeymap-bkeymap.c
                -e 's,@BUILDDIR@,$(builddir),g' \
                <$< >$(builddir)/$@
        touch -r $< $(builddir)/$@
-       chmod --reference=$< $(builddir)/$@
+       chmod 755 $(builddir)/$@

diff --git a/tests/dumpkeys-bkeymap.in b/tests/dumpkeys-bkeymap.in
index 7be046b..a3df180 100755 (executable)
--- a/tests/dumpkeys-bkeymap.in
+++ b/tests/dumpkeys-bkeymap.in
@@ -7,7 +7,7 @@ cd "$cwd"
 rc=0
 temp="$(mktemp "@BUILDDIR@/temp.XXXXXXXXX")"
 
-./libkeymap-bkeymap ../data/keymaps/i386/qwerty/defkeymap.map > "$temp" || rc=$?
+./libkeymap-bkeymap "@DATADIR@/"../data/keymaps/i386/qwerty/defkeymap.map > "$temp" || rc=$?
 cmp -s "@DATADIR@/dumpkeys.bkeymap.bin" "$temp" || rc=$?
 
 if [ "$rc" != 0 ]; then

diff --git a/tests/dumpkeys-mktable.in b/tests/dumpkeys-mktable.in
index 18e7c39..3ea7f62 100755 (executable)
--- a/tests/dumpkeys-mktable.in
+++ b/tests/dumpkeys-mktable.in
@@ -7,7 +7,7 @@ cd "$cwd"
 rc=0
 temp="$(mktemp "@BUILDDIR@/temp.XXXXXXXXX")"
 
-./libkeymap-mktable ../data/keymaps/i386/qwerty/defkeymap.map > "$temp" || rc=$?
+./libkeymap-mktable "@DATADIR@/"../data/keymaps/i386/qwerty/defkeymap.map > "$temp" || rc=$?
 cmp -s "@DATADIR@/dumpkeys.defkeymap.c" "$temp" || rc=$?
 
 if [ "$rc" != 0 ]; then