updating the build process

4 files changed, 13 insertions, 21 deletions

diff --git a/geometry/Makefile.am b/geometry/Makefile.am
index c0593756..26a19c0a 100644
--- a/geometry/Makefile.am
+++ b/geometry/Makefile.am
@@ -1,6 +1,8 @@
 SUBDIRS = digital_vndr  ibm_vndr  sgi_vndr
 
-geom_DATA = \
+geomdir = $(xkb_base)/geometry
+
+dist_geom_DATA = \
 amiga ataritt chicony \
 dell everex fujitsu \
 hp keytronic kinesis \
@@ -8,8 +10,4 @@ macintosh microsoft nec \
 northgate pc sony \
 sun winbook README
 
-EXTRA_DIST= $(geom_DATA)
-                                                                                          
-geomdir = $(xkb_base)/geometry
-
-
+include $(top_srcdir)/xkbrules.am
diff --git a/geometry/digital_vndr/Makefile.am b/geometry/digital_vndr/Makefile.am
index 24535df2..821c0ccf 100644
--- a/geometry/digital_vndr/Makefile.am
+++ b/geometry/digital_vndr/Makefile.am
@@ -1,6 +1,4 @@
-geom_DATA = \
-lk  pc  unix
-
-EXTRA_DIST= $(geom_DATA)
-                                                                                          
 geomdir = $(xkb_base)/geometry/digital_vndr
+
+dist_geom_DATA = \
+lk  pc  unix
diff --git a/geometry/ibm_vndr/Makefile.am b/geometry/ibm_vndr/Makefile.am
index 6e80f01f..84130ace 100644
--- a/geometry/ibm_vndr/Makefile.am
+++ b/geometry/ibm_vndr/Makefile.am
@@ -1,6 +1,4 @@
-geom_DATA = \
-thinkpad
-
-EXTRA_DIST= $(geom_DATA)
-                                                                                          
 geomdir = $(xkb_base)/geometry/ibm_vndr
+
+dist_geom_DATA = \
+thinkpad
diff --git a/geometry/sgi_vndr/Makefile.am b/geometry/sgi_vndr/Makefile.am
index 52ce17d7..5c76e4b4 100644
--- a/geometry/sgi_vndr/Makefile.am
+++ b/geometry/sgi_vndr/Makefile.am
@@ -1,6 +1,4 @@
-geom_DATA = \
-indigo  indy  O2
-
-EXTRA_DIST= $(geom_DATA)
-                                                                                          
 geomdir = $(xkb_base)/geometry/sgi_vndr
+
+dist_geom_DATA = \
+indigo  indy  O2