From cee3e4186d1eb6a4d3c68cba7bad280fb53e8244 Mon Sep 17 00:00:00 2001
From: svu <svu>
Date: Fri, 3 Dec 2004 00:44:01 +0000
Subject: [PATCH] a bit of cleanup

---
 ChangeLog            |  5 +++++
 Makefile.am          |  7 +++++--
 compiled/.cvsignore  |  2 --
 compiled/Makefile.am |  6 ------
 compiled/README      | 13 -------------
 configure.in         |  4 ++--
 6 files changed, 12 insertions(+), 25 deletions(-)
 delete mode 100644 compiled/.cvsignore
 delete mode 100644 compiled/Makefile.am
 delete mode 100644 compiled/README

diff --git a/ChangeLog b/ChangeLog
index 3a93068..eddf21d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-12-03 00:40  svu
+
+	* configure.in, Makefile.am, compiled: some cleanup in the 
+	build process
+
 2004-11-29 19:00  svu
 
 	* symbols/sin: Small patch for Sinhala from Harshula
diff --git a/Makefile.am b/Makefile.am
index 335599a..6d7829a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = compat compiled geometry keycodes keymap po rules semantics symbols types docs
+SUBDIRS = compat geometry keycodes keymap po rules semantics symbols types docs
 
 EXTRA_DIST= config.rpath  COPYING README \
        autogen.sh \
@@ -11,8 +11,11 @@ dnl ACLOCAL_AMFLAGS = -I m4
 if CREATE_XKBCOMP_SYMLINK
 install-data-hook:
 	ln -sf ../../../bin/xkbcomp $(DESTDIR)$(xkb_base)/xkbcomp
-
+	rm -f $(DESTDIR)$(xkb_base)/compiled
+	ln -sf /var/lib/xkb $(DESTDIR)$(xkb_base)/compiled
 else
 install-data-hook:
+	rm -f $(DESTDIR)$(xkb_base)/compiled
+	ln -sf /var/lib/xkb $(DESTDIR)$(xkb_base)/compiled
 
 endif
diff --git a/compiled/.cvsignore b/compiled/.cvsignore
deleted file mode 100644
index 282522d..0000000
--- a/compiled/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/compiled/Makefile.am b/compiled/Makefile.am
deleted file mode 100644
index dd89bfa..0000000
--- a/compiled/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-compiled_DATA = \
-README
-                                                                                          
-EXTRA_DIST= $(compiled_DATA)
-                                                                                          
-compileddir = $(xkb_base)/compiled
diff --git a/compiled/README b/compiled/README
deleted file mode 100644
index 71caa2f..0000000
--- a/compiled/README
+++ /dev/null
@@ -1,13 +0,0 @@
-
-The X server uses this directory to store the compiled version of the
-current keymap and/or any scratch keymaps used by clients.  The X server
-or some other tool might destroy or replace the files in this directory,
-so it is not a safe place to store compiled keymaps for long periods of
-time.  The default keymap for any server is usually stored in:
-     X<num>-default.xkm
-where <num> is the display number of the server in question, which makes
-it possible for several servers *on the same host* to share the same 
-directory.
-
-Unless the X server is modified, sharing this directory between servers on
-different hosts could cause problems.
diff --git a/configure.in b/configure.in
index 699e001..d4c57e7 100644
--- a/configure.in
+++ b/configure.in
@@ -43,7 +43,8 @@ AM_CONDITIONAL(CREATE_XKBCOMP_SYMLINK, test "x$enable_xkbcomp_symlink" == "xyes"
 AM_CONDITIONAL(USE_COMPAT_RULES, test "x$enable_compat_rules" == "xyes")
 
 AC_PROG_INTLTOOL(0.30)
-AM_GNU_GETTEXT([external])
+dnl AM_GNU_GETTEXT([external])
+dnl AM_GNU_GETTEXT()
 ALL_LINGUAS="af az bg cs da fr hu nl ru sk sq sr sv tr uk zh_CN"
 
 AC_SUBST(xkb_base)
@@ -52,7 +53,6 @@ AC_SUBST(xkb_rules_symlink)
 AC_OUTPUT([ po/Makefile
 Makefile
 compat/Makefile
-compiled/Makefile
 geometry/Makefile
 geometry/digital_vndr/Makefile
 geometry/ibm_vndr/Makefile
-- 
2.32.0.93.g670b81a890