From 18561b83a890c907513421f2ae934adf9f894da1 Mon Sep 17 00:00:00 2001
From: svu <svu>
Date: Sun, 6 Jun 2004 03:22:32 +0000
Subject: [PATCH] adding HOWTO.transition

---
 docs/HOWTO.transition    | 19 +++++++++++++++++++
 docs/Makefile.am         |  2 +-
 rules/Makefile.am        |  6 +++---
 xkeyboard-config.spec.in |  2 +-
 4 files changed, 24 insertions(+), 5 deletions(-)
 create mode 100644 docs/HOWTO.transition

diff --git a/docs/HOWTO.transition b/docs/HOWTO.transition
new file mode 100644
index 0000000..f671af9
--- /dev/null
+++ b/docs/HOWTO.transition
@@ -0,0 +1,19 @@
+PURPOSE
+
+This document describes the procedure for replacing the standard XKB configuration repository shipped with an X Window System implementation. The procedure should work for XFree86 4.3 and higher and X11R7 implementation from X.Org. Any other X server supporting so called "multiple layouts" can be powered with XKeyboardConfig in a similar way (at the moment NO known commercial X Window System implementations support "multimple layouts"). X servers which do not support "multiple layouts" can be used with XKeyboardConfig as well - but users should be aware that only one group will be accessible with each possible XKB configuration.
+
+PROCEDURE
+
+1. Find your current XKB configuration data directory. In most cases it is /usr/X11R6/lib/X11/xkb. This directory usually contain subdirectores: compat, compiled, geometry, keycodes, keymap, rules, semantics, symbols etc.
+
+2. Backup your current XKB configuration data directory (for example, rename it to xkb.orig) - so you would be able to restore your original configuration in case of troubles.
+
+3. Untar XKeyboardConfiguration tarball (tar -xzvf xkeyboard-config-0.2.tar.gz). Change to the root project directory. Run the configure script with appropriate options. There are several useful options:
+  
+  --with-xkb-rules-symlink=NAME - this option creates symlinks for the rules and registry files. The default file names are base and base.xml correspondingly. Using this option allows to create symlinks for configuration files compatibility (for example, --with-xkb-rules-symlink=xfree86 creates symlinks xfree86 and xfree86.xml - so users would be able to use rules set "xfree86").
+  
+  --enable-xkbcomp-symlink - creates symlink from original xkbcomp utility (usually found in /usr/X111R6/bin) to XKB configuration directory (usually it is required by XKB server). By default, this option is enabled - but user can disable it.
+  
+4. Run "make" and (as root) "make install". At that point, new /usr/X11R6/lib/X11/xkb should be created.
+
+5. Adjust the configuration files (XF86Config, xorg.conf etc.). If you don't use the symlinks, you should use the rules set "base" (as the "XkbRules" value). If you added --with-xkb-rules-symlink option, you can use either "base" or the name of the rules symlink you created (for example, "xfree86").
diff --git a/docs/Makefile.am b/docs/Makefile.am
index 931b8c8..56fd9ea 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -1 +1 @@
-EXTRA_DIST= README.config README.enhancing
+EXTRA_DIST= README.config README.enhancing HOWTO.transition
diff --git a/rules/Makefile.am b/rules/Makefile.am
index 7369a7e..047a93c 100644
--- a/rules/Makefile.am
+++ b/rules/Makefile.am
@@ -4,9 +4,9 @@ if CREATE_RULES_SYMLINK
   extra_lst_file   = $(extra_rules_file).lst
 
 install-data-hook:
-	ln -s base     $(DESTDIR)$(rulesdir)/$(extra_rules_file)
-	ln -s base.lst $(DESTDIR)$(rulesdir)/$(extra_lst_file)
-	ln -s base.xml $(DESTDIR)$(rulesdir)/$(extra_dir_file)
+	ln -sf base     $(DESTDIR)$(rulesdir)/$(extra_rules_file)
+	ln -sf base.lst $(DESTDIR)$(rulesdir)/$(extra_lst_file)
+	ln -sf base.xml $(DESTDIR)$(rulesdir)/$(extra_dir_file)
 
 else
 install-data-hook:
diff --git a/xkeyboard-config.spec.in b/xkeyboard-config.spec.in
index b9d189e..ae6b97f 100644
--- a/xkeyboard-config.spec.in
+++ b/xkeyboard-config.spec.in
@@ -41,5 +41,5 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version}
 %files
 %defattr(-, root, root)
 
-%doc AUTHORS ChangeLog NEWS README COPYING docs/README.config docs/README.enhancing
+%doc AUTHORS ChangeLog NEWS README COPYING docs/README.config docs/README.enhancing docs/HOWTO.transition
 %{_prefix}/X11R6/lib/X11/xkb/*
-- 
2.32.0.93.g670b81a890