summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--configure.ac2
-rw-r--r--keycodes/Makefile.am8
-rw-r--r--keycodes/digital_vndr/Makefile.am4
-rw-r--r--keycodes/sgi_vndr/Makefile.am4
4 files changed, 6 insertions, 12 deletions
diff --git a/configure.ac b/configure.ac
index 4f4e932..4b7a419 100644
--- a/configure.ac
+++ b/configure.ac
@@ -78,8 +78,6 @@ Makefile
compat/Makefile
geometry/Makefile
keycodes/Makefile
-keycodes/digital_vndr/Makefile
-keycodes/sgi_vndr/Makefile
rules/Makefile
rules/compat/Makefile
symbols/Makefile
diff --git a/keycodes/Makefile.am b/keycodes/Makefile.am
index ac832d7..0405030 100644
--- a/keycodes/Makefile.am
+++ b/keycodes/Makefile.am
@@ -1,5 +1,3 @@
-SUBDIRS = digital_vndr sgi_vndr
-
keycodesdir = $(xkb_base)/keycodes
dist_keycodes_DATA = \
@@ -19,3 +17,9 @@ dist_keycodes_DATA = \
xfree86 \
xfree98 \
README
+
+digitaldir = $(keycodesdir)/digital_vndr
+dist_digital_DATA = digital_vndr/lk digital_vndr/pc
+
+sgidir = $(keycodesdir)/sgi_vndr
+dist_sgi_DATA = sgi_vndr/indigo sgi_vndr/indy sgi_vndr/iris
diff --git a/keycodes/digital_vndr/Makefile.am b/keycodes/digital_vndr/Makefile.am
deleted file mode 100644
index 4f4cc4f..0000000
--- a/keycodes/digital_vndr/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-keycodesdir = $(xkb_base)/keycodes/digital_vndr
-
-dist_keycodes_DATA = \
-lk pc
diff --git a/keycodes/sgi_vndr/Makefile.am b/keycodes/sgi_vndr/Makefile.am
deleted file mode 100644
index f601268..0000000
--- a/keycodes/sgi_vndr/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-keycodesdir = $(xkb_base)/keycodes/sgi_vndr
-
-dist_keycodes_DATA = \
-indigo indy iris