summaryrefslogtreecommitdiff
path: root/keymap
diff options
context:
space:
mode:
authorsvu <svu>2005-08-06 00:47:54 +0000
committersvu <svu>2005-08-06 00:47:54 +0000
commitcc10f76ec1feb16a193d751bf2ff52393e0380ef (patch)
tree3cfccf03df8e99a948ceb0c17d4adb34a523f652 /keymap
parentf44be8d5ec16806b86720076b3c5fea917a1c151 (diff)
updating the build process
Diffstat (limited to 'keymap')
-rw-r--r--keymap/Makefile.am10
-rw-r--r--keymap/digital_vndr/Makefile.am10
-rw-r--r--keymap/sgi_vndr/Makefile.am8
-rw-r--r--keymap/sun_vndr/Makefile.am8
4 files changed, 14 insertions, 22 deletions
diff --git a/keymap/Makefile.am b/keymap/Makefile.am
index 7a1c112..621e5c8 100644
--- a/keymap/Makefile.am
+++ b/keymap/Makefile.am
@@ -1,10 +1,10 @@
SUBDIRS = digital_vndr sgi_vndr sun_vndr
-km_DATA = \
+keymapdir = $(xkb_base)/keymap
+
+dist_keymap_DATA = \
amiga ataritt macintosh \
sony xfree86 xfree98 \
README
-
-EXTRA_DIST= $(km_DATA)
-
-kmdir = $(xkb_base)/keymap
+
+include $(top_srcdir)/xkbrules.am
diff --git a/keymap/digital_vndr/Makefile.am b/keymap/digital_vndr/Makefile.am
index b17bbe3..b1961e5 100644
--- a/keymap/digital_vndr/Makefile.am
+++ b/keymap/digital_vndr/Makefile.am
@@ -1,8 +1,4 @@
-km_DATA = \
-us
-
-EXTRA_DIST= $(km_DATA)
-
-kmdir = $(xkb_base)/keymap/digital_vndr
-
+keymapdir = $(xkb_base)/keymap/digital_vndr
+dist_keymap_DATA = \
+us
diff --git a/keymap/sgi_vndr/Makefile.am b/keymap/sgi_vndr/Makefile.am
index 4acb4f2..234a336 100644
--- a/keymap/sgi_vndr/Makefile.am
+++ b/keymap/sgi_vndr/Makefile.am
@@ -1,4 +1,6 @@
-km_DATA = \
+keymapdir = $(xkb_base)/keymap/sgi_vndr
+
+dist_keymap_DATA = \
be bg ca \
ch cz de \
dk dvorak \
@@ -8,7 +10,3 @@ hu it jp \
no pl pt \
ru se sk \
th us
-
-EXTRA_DIST= $(km_DATA)
-
-kmdir = $(xkb_base)/keymap/sgi_vndr
diff --git a/keymap/sun_vndr/Makefile.am b/keymap/sun_vndr/Makefile.am
index 47953c4..0049ad9 100644
--- a/keymap/sun_vndr/Makefile.am
+++ b/keymap/sun_vndr/Makefile.am
@@ -1,9 +1,7 @@
-km_DATA = \
+keymapdir = $(xkb_base)/keymap/sun_vndr
+
+dist_keymap_DATA = \
de es fi \
fr no pl \
ru se uk \
us
-
-EXTRA_DIST= $(km_DATA)
-
-kmdir = $(xkb_base)/keymap/sun_vndr