Index: app/setxkbmap/Makefile.am =================================================================== RCS file: /cvs/xorg/app/setxkbmap/Makefile.am,v retrieving revision 1.3 diff -u -r1.3 Makefile.am --- app/setxkbmap/Makefile.am 27 Jul 2005 01:54:17 -0000 1.3 +++ app/setxkbmap/Makefile.am 16 Sep 2005 11:27:02 -0000 @@ -21,7 +21,7 @@ bin_PROGRAMS = setxkbmap -setxkbmap_CFLAGS = $(SETXKBMAP_CFLAGS) -D__XKBDEFRULES__='"xorg"' +setxkbmap_CFLAGS = $(SETXKBMAP_CFLAGS) -D__XKBDEFRULES__='"@__XKBDEFRULES__@"' -DDFLT_XKB_CONFIG_ROOT='"@XKBPATH@"' setxkbmap_LDADD = $(SETXKBMAP_LIBS) setxkbmap_SOURCES = \ Index: app/setxkbmap/configure.ac =================================================================== RCS file: /cvs/xorg/app/setxkbmap/configure.ac,v retrieving revision 1.3 diff -u -r1.3 configure.ac --- app/setxkbmap/configure.ac 29 Jul 2005 21:22:30 -0000 1.3 +++ app/setxkbmap/configure.ac 16 Sep 2005 11:27:02 -0000 @@ -36,6 +36,14 @@ AC_SUBST(SETXKBMAP_CFLAGS) AC_SUBST(SETXKBMAP_LIBS) +AC_ARG_WITH(xkb-path, [ --with-xkb-path=PATH ], + [ XKBPATH="$withval" ], + [ XKBPATH="${datadir}/X11/xkb" ]) + +__XKBDEFRULES__="xorg" +AC_SUBST(__XKBDEFRULES__) +AC_SUBST(XKBPATH) + XORG_RELEASE_VERSION AC_OUTPUT([Makefile]) Index: app/xkbcomp/Makefile.am =================================================================== RCS file: /cvs/xorg/app/xkbcomp/Makefile.am,v retrieving revision 1.6 diff -u -r1.6 Makefile.am --- app/xkbcomp/Makefile.am 1 Sep 2005 19:37:02 -0000 1.6 +++ app/xkbcomp/Makefile.am 16 Sep 2005 11:27:02 -0000 @@ -19,9 +19,9 @@ # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -bin_PROGRAMS = xkbcomp +xkbbin_PROGRAMS = xkbcomp -AM_CFLAGS = $(XKBCOMP_CFLAGS) -DDFLT_XKB_CONFIG_ROOT='"$(datadir)/X11/xkb"' +AM_CFLAGS = $(XKBCOMP_CFLAGS) -DDFLT_XKB_CONFIG_ROOT='"@XKBPATH@"' xkbcomp_LDADD = $(XKBCOMP_LIBS) xkbcomp_SOURCES = \ Index: app/xkbcomp/configure.ac =================================================================== RCS file: /cvs/xorg/app/xkbcomp/configure.ac,v retrieving revision 1.4 diff -u -r1.4 configure.ac --- app/xkbcomp/configure.ac 29 Jul 2005 21:22:35 -0000 1.4 +++ app/xkbcomp/configure.ac 16 Sep 2005 11:27:02 -0000 @@ -37,6 +37,16 @@ AC_SUBST(XKBCOMP_CFLAGS) AC_SUBST(XKBCOMP_LIBS) +AC_ARG_WITH(xkb-path, [ --with-xkb-path=PATH ], + [ XKBPATH="$withval" ], + [ XKBPATH="${datadir}/X11/xkb" ]) +AC_ARG_WITH(xkb-bindir, [ --with-xkb-bindir=PATH ], + [ XKBBINDIR="$withval" ], + [ XKBBINDIR="${bindir}" ]) +AC_SUBST(XKBPATH) +xkbbindir=$XKBBINDIR +AC_SUBST(xkbbindir) + XORG_RELEASE_VERSION AC_OUTPUT([Makefile]) Index: app/xkbevd/Makefile.am =================================================================== RCS file: /cvs/xorg/app/xkbevd/Makefile.am,v retrieving revision 1.4 diff -u -r1.4 Makefile.am --- app/xkbevd/Makefile.am 2 Aug 2005 18:05:15 -0000 1.4 +++ app/xkbevd/Makefile.am 16 Sep 2005 11:27:02 -0000 @@ -20,7 +20,7 @@ bin_PROGRAMS = xkbevd -xkbevd_CFLAGS = $(XKBEVD_CFLAGS) +xkbevd_CFLAGS = $(XKBEVD_CFLAGS) -DDFLT_XKB_CONFIG_ROOT='"@XKBPATH@"' xkbevd_LDADD = $(XKBEVD_LIBS) xkbevd_SOURCES = \ Index: app/xkbevd/configure.ac =================================================================== RCS file: /cvs/xorg/app/xkbevd/configure.ac,v retrieving revision 1.3 diff -u -r1.3 configure.ac --- app/xkbevd/configure.ac 29 Jul 2005 21:22:35 -0000 1.3 +++ app/xkbevd/configure.ac 16 Sep 2005 11:27:02 -0000 @@ -37,6 +37,11 @@ AC_SUBST(XKBEVD_CFLAGS) AC_SUBST(XKBEVD_LIBS) +AC_ARG_WITH(xkb-path, [ --with-xkb-path=PATH ], + [ XKBPATH="$withval" ], + [ XKBPATH="${datadir}/X11/xkb" ]) +AC_SUBST(XKBPATH) + XORG_RELEASE_VERSION AC_OUTPUT([Makefile]) Index: data/xkbdata/configure.ac =================================================================== RCS file: /cvs/xorg/data/xkbdata/configure.ac,v retrieving revision 1.3 diff -u -r1.3 configure.ac --- data/xkbdata/configure.ac 29 Jul 2005 21:22:39 -0000 1.3 +++ data/xkbdata/configure.ac 16 Sep 2005 11:27:02 -0000 @@ -12,6 +12,12 @@ AC_ERROR([xkbcomp is required to install the xkb data files]) fi +AC_ARG_WITH(xkb-path, [ --with-xkb-path=PATH ], + [ XKBPATH="$withval" ], + [ XKBPATH="${datadir}/X11/xkb" ]) +xkbdatadir=$XKBPATH +AC_SUBST(xkbdatadir) + XORG_RELEASE_VERSION AC_OUTPUT([ Index: data/xkbdata/compat/Makefile.am =================================================================== RCS file: /cvs/xorg/data/xkbdata/compat/Makefile.am,v retrieving revision 1.4 diff -u -r1.4 Makefile.am --- data/xkbdata/compat/Makefile.am 17 Aug 2005 12:24:08 -0000 1.4 +++ data/xkbdata/compat/Makefile.am 16 Sep 2005 11:27:02 -0000 @@ -1,4 +1,4 @@ -xkbdata_compatdir = $(libdir)/X11/xkb/compat +xkbdata_compatdir = $(xkbdatadir)/compat dist_xkbdata_compat_DATA = \ accessx \ basic \ @@ -19,7 +19,6 @@ xfree86 \ xtest -xkbdatadir = $(libdir)/X11/xkb xkbdata_DATA = compat.dir include $(top_srcdir)/xkbrules.am Index: data/xkbdata/geometry/Makefile.am =================================================================== RCS file: /cvs/xorg/data/xkbdata/geometry/Makefile.am,v retrieving revision 1.3 diff -u -r1.3 Makefile.am --- data/xkbdata/geometry/Makefile.am 6 Aug 2005 02:30:40 -0000 1.3 +++ data/xkbdata/geometry/Makefile.am 16 Sep 2005 11:27:02 -0000 @@ -1,6 +1,6 @@ SUBDIRS = digital sgi ibm -xkbdata_geometrydir = $(libdir)/X11/xkb/geometry +xkbdata_geometrydir = $(xkbdatadir)/geometry dist_xkbdata_geometry_DATA = \ amiga \ ataritt \ @@ -21,7 +21,6 @@ sun \ winbook -xkbdatadir = $(libdir)/X11/xkb xkbdata_DATA = geometry.dir include $(top_srcdir)/xkbrules.am Index: data/xkbdata/geometry/digital/Makefile.am =================================================================== RCS file: /cvs/xorg/data/xkbdata/geometry/digital/Makefile.am,v retrieving revision 1.2 diff -u -r1.2 Makefile.am --- data/xkbdata/geometry/digital/Makefile.am 6 Aug 2005 02:30:40 -0000 1.2 +++ data/xkbdata/geometry/digital/Makefile.am 16 Sep 2005 11:27:02 -0000 @@ -1,4 +1,4 @@ -xkbdata_geometry_digitaldir = $(libdir)/X11/xkb/geometry/digital +xkbdata_geometry_digitaldir = $(xkbdatadir)/geometry/digital dist_xkbdata_geometry_digital_DATA = \ lk \ pc \ Index: data/xkbdata/geometry/ibm/Makefile.am =================================================================== RCS file: /cvs/xorg/data/xkbdata/geometry/ibm/Makefile.am,v retrieving revision 1.2 diff -u -r1.2 Makefile.am --- data/xkbdata/geometry/ibm/Makefile.am 6 Aug 2005 02:30:40 -0000 1.2 +++ data/xkbdata/geometry/ibm/Makefile.am 16 Sep 2005 11:27:02 -0000 @@ -1,3 +1,3 @@ -xkbdata_geometry_ibmdir = $(libdir)/X11/xkb/geometry/ibm +xkbdata_geometry_ibmdir = $(xkbdatadir)/geometry/ibm dist_xkbdata_geometry_ibm_DATA = \ thinkpad Index: data/xkbdata/geometry/sgi/Makefile.am =================================================================== RCS file: /cvs/xorg/data/xkbdata/geometry/sgi/Makefile.am,v retrieving revision 1.2 diff -u -r1.2 Makefile.am --- data/xkbdata/geometry/sgi/Makefile.am 6 Aug 2005 02:30:40 -0000 1.2 +++ data/xkbdata/geometry/sgi/Makefile.am 16 Sep 2005 11:27:02 -0000 @@ -1,4 +1,4 @@ -xkbdata_geometry_sgidir = $(libdir)/X11/xkb/geometry/sgi +xkbdata_geometry_sgidir = $(xkbdatadir)/geometry/sgi dist_xkbdata_geometry_sgi_DATA = \ indigo \ indy \ Index: data/xkbdata/keycodes/Makefile.am =================================================================== RCS file: /cvs/xorg/data/xkbdata/keycodes/Makefile.am,v retrieving revision 1.3 diff -u -r1.3 Makefile.am --- data/xkbdata/keycodes/Makefile.am 6 Aug 2005 02:30:40 -0000 1.3 +++ data/xkbdata/keycodes/Makefile.am 16 Sep 2005 11:27:02 -0000 @@ -1,6 +1,6 @@ SUBDIRS = digital sgi -xkbdata_keycodesdir = $(libdir)/X11/xkb/keycodes +xkbdata_keycodesdir = $(xkbdatadir)/keycodes dist_xkbdata_keycodes_DATA = \ aliases \ amiga \ @@ -16,7 +16,6 @@ xfree86 \ xfree98 -xkbdatadir = $(libdir)/X11/xkb xkbdata_DATA = keycodes.dir include $(top_srcdir)/xkbrules.am Index: data/xkbdata/keycodes/digital/Makefile.am =================================================================== RCS file: /cvs/xorg/data/xkbdata/keycodes/digital/Makefile.am,v retrieving revision 1.1 diff -u -r1.1 Makefile.am --- data/xkbdata/keycodes/digital/Makefile.am 15 Jul 2005 21:42:46 -0000 1.1 +++ data/xkbdata/keycodes/digital/Makefile.am 16 Sep 2005 11:27:02 -0000 @@ -1,4 +1,4 @@ -xkbdata_keycodes_digitaldir = $(libdir)/X11/xkb/keycodes/digital +xkbdata_keycodes_digitaldir = $(xkbdatadir)/keycodes/digital dist_xkbdata_keycodes_digital_DATA = \ lk \ pc Index: data/xkbdata/keycodes/sgi/Makefile.am =================================================================== RCS file: /cvs/xorg/data/xkbdata/keycodes/sgi/Makefile.am,v retrieving revision 1.2 diff -u -r1.2 Makefile.am --- data/xkbdata/keycodes/sgi/Makefile.am 6 Aug 2005 02:30:40 -0000 1.2 +++ data/xkbdata/keycodes/sgi/Makefile.am 16 Sep 2005 11:27:02 -0000 @@ -1,4 +1,4 @@ -xkbdata_keycodes_sgidir = $(libdir)/X11/xkb/keycodes/sgi +xkbdata_keycodes_sgidir = $(xkbdatadir)/keycodes/sgi dist_xkbdata_keycodes_sgi_DATA = \ indigo \ indy \ Index: data/xkbdata/keymap/Makefile.am =================================================================== RCS file: /cvs/xorg/data/xkbdata/keymap/Makefile.am,v retrieving revision 1.3 diff -u -r1.3 Makefile.am --- data/xkbdata/keymap/Makefile.am 6 Aug 2005 02:30:40 -0000 1.3 +++ data/xkbdata/keymap/Makefile.am 16 Sep 2005 11:27:02 -0000 @@ -1,6 +1,6 @@ SUBDIRS = sun digital sgi -xkbdata_keymapdir = $(libdir)/X11/xkb/keymap +xkbdata_keymapdir = $(xkbdatadir)/keymap dist_xkbdata_keymap_DATA = \ amiga \ ataritt \ @@ -10,7 +10,6 @@ xfree86 \ xfree98 -xkbdatadir = $(libdir)/X11/xkb xkbdata_DATA = keymap.dir include $(top_srcdir)/xkbrules.am Index: data/xkbdata/keymap/digital/Makefile.am =================================================================== RCS file: /cvs/xorg/data/xkbdata/keymap/digital/Makefile.am,v retrieving revision 1.2 diff -u -r1.2 Makefile.am --- data/xkbdata/keymap/digital/Makefile.am 6 Aug 2005 02:30:40 -0000 1.2 +++ data/xkbdata/keymap/digital/Makefile.am 16 Sep 2005 11:27:02 -0000 @@ -1,3 +1,3 @@ -xkbdata_keymap_digitaldir = $(libdir)/X11/xkb/keymap/digital +xkbdata_keymap_digitaldir = $(xkbdatadir)/keymap/digital dist_xkbdata_keymap_digital_DATA = \ us Index: data/xkbdata/keymap/sgi/Makefile.am =================================================================== RCS file: /cvs/xorg/data/xkbdata/keymap/sgi/Makefile.am,v retrieving revision 1.2 diff -u -r1.2 Makefile.am --- data/xkbdata/keymap/sgi/Makefile.am 6 Aug 2005 02:30:40 -0000 1.2 +++ data/xkbdata/keymap/sgi/Makefile.am 16 Sep 2005 11:27:02 -0000 @@ -1,4 +1,4 @@ -xkbdata_keymap_sgidir = $(libdir)/X11/xkb/keymap/sgi +xkbdata_keymap_sgidir = $(xkbdatadir)/keymap/sgi dist_xkbdata_keymap_sgi_DATA = \ be \ bg \ Index: data/xkbdata/keymap/sun/Makefile.am =================================================================== RCS file: /cvs/xorg/data/xkbdata/keymap/sun/Makefile.am,v retrieving revision 1.2 diff -u -r1.2 Makefile.am --- data/xkbdata/keymap/sun/Makefile.am 6 Aug 2005 02:30:41 -0000 1.2 +++ data/xkbdata/keymap/sun/Makefile.am 16 Sep 2005 11:27:02 -0000 @@ -1,4 +1,4 @@ -xkbdata_keymap_sundir = $(libdir)/X11/xkb/keymap/sun +xkbdata_keymap_sundir = $(xkbdatadir)/keymap/sun dist_xkbdata_keymap_sun_DATA = \ de \ es \ Index: data/xkbdata/rules/Makefile.am =================================================================== RCS file: /cvs/xorg/data/xkbdata/rules/Makefile.am,v retrieving revision 1.2 diff -u -r1.2 Makefile.am --- data/xkbdata/rules/Makefile.am 6 Aug 2005 02:30:41 -0000 1.2 +++ data/xkbdata/rules/Makefile.am 16 Sep 2005 11:27:02 -0000 @@ -1,4 +1,4 @@ -xkbdata_rulesdir = $(libdir)/X11/xkb/rules +xkbdata_rulesdir = $(xkbdatadir)/rules dist_xkbdata_rules_DATA = \ README \ sgi \ Index: data/xkbdata/semantics/Makefile.am =================================================================== RCS file: /cvs/xorg/data/xkbdata/semantics/Makefile.am,v retrieving revision 1.2 diff -u -r1.2 Makefile.am --- data/xkbdata/semantics/Makefile.am 6 Aug 2005 02:30:41 -0000 1.2 +++ data/xkbdata/semantics/Makefile.am 16 Sep 2005 11:27:02 -0000 @@ -1,4 +1,4 @@ -xkbdata_semanticsdir = $(libdir)/X11/xkb/semantics +xkbdata_semanticsdir = $(xkbdatadir)/semantics dist_xkbdata_semantics_DATA = \ basic \ complete \ Index: data/xkbdata/symbols/Makefile.am =================================================================== RCS file: /cvs/xorg/data/xkbdata/symbols/Makefile.am,v retrieving revision 1.4 diff -u -r1.4 Makefile.am --- data/xkbdata/symbols/Makefile.am 17 Aug 2005 12:24:09 -0000 1.4 +++ data/xkbdata/symbols/Makefile.am 16 Sep 2005 11:27:02 -0000 @@ -1,6 +1,6 @@ SUBDIRS = pc macintosh sun fujitsu nec digital hp sgi sony xfree68 -xkbdata_symbolsdir = $(libdir)/X11/xkb/symbols +xkbdata_symbolsdir = $(xkbdatadir)/symbols dist_xkbdata_symbols_DATA = \ al \ altwin \ @@ -116,7 +116,6 @@ vn \ yu -xkbdatadir = $(libdir)/X11/xkb xkbdata_DATA = symbols.dir include $(top_srcdir)/xkbrules.am Index: data/xkbdata/symbols/digital/Makefile.am =================================================================== RCS file: /cvs/xorg/data/xkbdata/symbols/digital/Makefile.am,v retrieving revision 1.2 diff -u -r1.2 Makefile.am --- data/xkbdata/symbols/digital/Makefile.am 6 Aug 2005 02:30:41 -0000 1.2 +++ data/xkbdata/symbols/digital/Makefile.am 16 Sep 2005 11:27:02 -0000 @@ -1,4 +1,4 @@ -xkbdata_symbols_digitaldir = $(libdir)/X11/xkb/symbols/digital +xkbdata_symbols_digitaldir = $(xkbdatadir)/symbols/digital dist_xkbdata_symbols_digital_DATA = \ lk \ pc \ Index: data/xkbdata/symbols/fujitsu/Makefile.am =================================================================== RCS file: /cvs/xorg/data/xkbdata/symbols/fujitsu/Makefile.am,v retrieving revision 1.2 diff -u -r1.2 Makefile.am --- data/xkbdata/symbols/fujitsu/Makefile.am 6 Aug 2005 02:30:41 -0000 1.2 +++ data/xkbdata/symbols/fujitsu/Makefile.am 16 Sep 2005 11:27:02 -0000 @@ -1,4 +1,4 @@ -xkbdata_symbols_fujitsudir = $(libdir)/X11/xkb/symbols/fujitsu +xkbdata_symbols_fujitsudir = $(xkbdatadir)/symbols/fujitsu dist_xkbdata_symbols_fujitsu_DATA = \ jp \ us Index: data/xkbdata/symbols/hp/Makefile.am =================================================================== RCS file: /cvs/xorg/data/xkbdata/symbols/hp/Makefile.am,v retrieving revision 1.2 diff -u -r1.2 Makefile.am --- data/xkbdata/symbols/hp/Makefile.am 6 Aug 2005 02:30:41 -0000 1.2 +++ data/xkbdata/symbols/hp/Makefile.am 16 Sep 2005 11:27:02 -0000 @@ -1,3 +1,3 @@ -xkbdata_symbols_hpdir = $(libdir)/X11/xkb/symbols/hp +xkbdata_symbols_hpdir = $(xkbdatadir)/symbols/hp dist_xkbdata_symbols_hp_DATA = \ us Index: data/xkbdata/symbols/macintosh/Makefile.am =================================================================== RCS file: /cvs/xorg/data/xkbdata/symbols/macintosh/Makefile.am,v retrieving revision 1.2 diff -u -r1.2 Makefile.am --- data/xkbdata/symbols/macintosh/Makefile.am 6 Aug 2005 02:30:41 -0000 1.2 +++ data/xkbdata/symbols/macintosh/Makefile.am 16 Sep 2005 11:27:02 -0000 @@ -1,4 +1,4 @@ -xkbdata_symbols_macintoshdir = $(libdir)/X11/xkb/symbols/macintosh +xkbdata_symbols_macintoshdir = $(xkbdatadir)/symbols/macintosh dist_xkbdata_symbols_macintosh_DATA = \ de \ de_CH \ Index: data/xkbdata/symbols/nec/Makefile.am =================================================================== RCS file: /cvs/xorg/data/xkbdata/symbols/nec/Makefile.am,v retrieving revision 1.2 diff -u -r1.2 Makefile.am --- data/xkbdata/symbols/nec/Makefile.am 6 Aug 2005 02:30:41 -0000 1.2 +++ data/xkbdata/symbols/nec/Makefile.am 16 Sep 2005 11:27:02 -0000 @@ -1,3 +1,3 @@ -xkbdata_symbols_necdir = $(libdir)/X11/xkb/symbols/nec +xkbdata_symbols_necdir = $(xkbdatadir)/symbols/nec dist_xkbdata_symbols_nec_DATA = \ jp Index: data/xkbdata/symbols/pc/Makefile.am =================================================================== RCS file: /cvs/xorg/data/xkbdata/symbols/pc/Makefile.am,v retrieving revision 1.3 diff -u -r1.3 Makefile.am --- data/xkbdata/symbols/pc/Makefile.am 17 Aug 2005 12:24:09 -0000 1.3 +++ data/xkbdata/symbols/pc/Makefile.am 16 Sep 2005 11:27:02 -0000 @@ -1,4 +1,4 @@ -xkbdata_symbols_pcdir = $(libdir)/X11/xkb/symbols/pc +xkbdata_symbols_pcdir = $(xkbdatadir)/symbols/pc dist_xkbdata_symbols_pc_DATA = \ al \ am \ Index: data/xkbdata/symbols/sgi/Makefile.am =================================================================== RCS file: /cvs/xorg/data/xkbdata/symbols/sgi/Makefile.am,v retrieving revision 1.2 diff -u -r1.2 Makefile.am --- data/xkbdata/symbols/sgi/Makefile.am 6 Aug 2005 02:30:41 -0000 1.2 +++ data/xkbdata/symbols/sgi/Makefile.am 16 Sep 2005 11:27:02 -0000 @@ -1,3 +1,3 @@ -xkbdata_symbols_sgidir = $(libdir)/X11/xkb/symbols/sgi +xkbdata_symbols_sgidir = $(xkbdatadir)/symbols/sgi dist_xkbdata_symbols_sgi_DATA = \ jp Index: data/xkbdata/symbols/sony/Makefile.am =================================================================== RCS file: /cvs/xorg/data/xkbdata/symbols/sony/Makefile.am,v retrieving revision 1.2 diff -u -r1.2 Makefile.am --- data/xkbdata/symbols/sony/Makefile.am 6 Aug 2005 02:30:42 -0000 1.2 +++ data/xkbdata/symbols/sony/Makefile.am 16 Sep 2005 11:27:02 -0000 @@ -1,3 +1,3 @@ -xkbdata_symbols_sonydir = $(libdir)/X11/xkb/symbols/sony +xkbdata_symbols_sonydir = $(xkbdatadir)/symbols/sony dist_xkbdata_symbols_sony_DATA = \ us Index: data/xkbdata/symbols/sun/Makefile.am =================================================================== RCS file: /cvs/xorg/data/xkbdata/symbols/sun/Makefile.am,v retrieving revision 1.2 diff -u -r1.2 Makefile.am --- data/xkbdata/symbols/sun/Makefile.am 6 Aug 2005 02:30:42 -0000 1.2 +++ data/xkbdata/symbols/sun/Makefile.am 16 Sep 2005 11:27:02 -0000 @@ -1,4 +1,4 @@ -xkbdata_symbols_sundir = $(libdir)/X11/xkb/symbols/sun +xkbdata_symbols_sundir = $(xkbdatadir)/symbols/sun dist_xkbdata_symbols_sun_DATA = \ se \ us \ Index: data/xkbdata/symbols/xfree68/Makefile.am =================================================================== RCS file: /cvs/xorg/data/xkbdata/symbols/xfree68/Makefile.am,v retrieving revision 1.2 diff -u -r1.2 Makefile.am --- data/xkbdata/symbols/xfree68/Makefile.am 6 Aug 2005 02:30:42 -0000 1.2 +++ data/xkbdata/symbols/xfree68/Makefile.am 16 Sep 2005 11:27:02 -0000 @@ -1,4 +1,4 @@ -xkbdata_symbols_xfree68dir = $(libdir)/X11/xkb/symbols/xfree68 +xkbdata_symbols_xfree68dir = $(xkbdatadir)/symbols/xfree68 dist_xkbdata_symbols_xfree68_DATA = \ amiga \ ataritt Index: data/xkbdata/torture/Makefile.am =================================================================== RCS file: /cvs/xorg/data/xkbdata/torture/Makefile.am,v retrieving revision 1.2 diff -u -r1.2 Makefile.am --- data/xkbdata/torture/Makefile.am 6 Aug 2005 02:30:42 -0000 1.2 +++ data/xkbdata/torture/Makefile.am 16 Sep 2005 11:27:02 -0000 @@ -1,4 +1,4 @@ -xkbdata_torturedir = $(libdir)/X11/xkb/torture +xkbdata_torturedir = $(xkbdatadir)/torture dist_xkbdata_torture_DATA = \ indicator \ indicator1 \ Index: data/xkbdata/types/Makefile.am =================================================================== RCS file: /cvs/xorg/data/xkbdata/types/Makefile.am,v retrieving revision 1.3 diff -u -r1.3 Makefile.am --- data/xkbdata/types/Makefile.am 6 Aug 2005 02:30:42 -0000 1.3 +++ data/xkbdata/types/Makefile.am 16 Sep 2005 11:27:02 -0000 @@ -1,4 +1,4 @@ -xkbdata_typesdir = $(libdir)/X11/xkb/types +xkbdata_typesdir = $(xkbdatadir)/types dist_xkbdata_types_DATA = \ basic \ cancel \ @@ -12,7 +12,6 @@ pc \ README -xkbdatadir = $(libdir)/X11/xkb xkbdata_DATA = types.dir include $(top_srcdir)/xkbrules.am Index: xc/programs/Xserver/xkb/xkbInit.c =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/xkb/xkbInit.c,v retrieving revision 1.8 diff -u -r1.8 xkbInit.c --- xc/programs/Xserver/xkb/xkbInit.c 1 Sep 2005 19:56:14 -0000 1.8 +++ xc/programs/Xserver/xkb/xkbInit.c 16 Sep 2005 11:27:14 -0000 @@ -101,7 +101,7 @@ #define XKB_BASE_DIRECTORY "/usr/lib/X11/xkb" #endif #ifndef XKB_BIN_DIRECTORY -#define XKB_BIN_DIRECTORY XKB_BASE_DIRECTORY +#define XKB_BIN_DIRECTORY "/usr/bin" #endif #ifndef XKB_DFLT_RULES_FILE #define XKB_DFLT_RULES_FILE "rules" Index: xc/programs/setxkbmap/setxkbmap.c =================================================================== RCS file: /cvs/xorg/xc/programs/setxkbmap/setxkbmap.c,v retrieving revision 1.2 diff -u -r1.2 setxkbmap.c --- xc/programs/setxkbmap/setxkbmap.c 23 Apr 2004 19:54:37 -0000 1.2 +++ xc/programs/setxkbmap/setxkbmap.c 16 Sep 2005 11:27:15 -0000 @@ -47,7 +47,7 @@ #endif #ifndef DFLT_XKB_CONFIG_ROOT -#define DFLT_XKB_CONFIG_ROOT "/usr/X11R6/lib/X11/xkb" +#define DFLT_XKB_CONFIG_ROOT "/usr/share/X11/xkb" #endif #ifndef DFLT_XKB_RULES_FILE #define DFLT_XKB_RULES_FILE __XKBDEFRULES__ Index: xc/programs/xkbcomp/xkbpath.c =================================================================== RCS file: /cvs/xorg/xc/programs/xkbcomp/xkbpath.c,v retrieving revision 1.2 diff -u -r1.2 xkbpath.c --- xc/programs/xkbcomp/xkbpath.c 23 Apr 2004 19:54:50 -0000 1.2 +++ xc/programs/xkbcomp/xkbpath.c 16 Sep 2005 11:27:18 -0000 @@ -37,7 +37,7 @@ #include "xkbpath.h" #ifndef DFLT_XKB_CONFIG_ROOT -#define DFLT_XKB_CONFIG_ROOT "/usr/lib/X11/xkb" +#define DFLT_XKB_CONFIG_ROOT "/usr/share/X11/xkb" #endif #ifndef PATH_MAX Index: xc/programs/xkbevd/xkbevd.c =================================================================== RCS file: /cvs/xorg/xc/programs/xkbevd/xkbevd.c,v retrieving revision 1.2 diff -u -r1.2 xkbevd.c --- xc/programs/xkbevd/xkbevd.c 23 Apr 2004 19:54:57 -0000 1.2 +++ xc/programs/xkbevd/xkbevd.c 16 Sep 2005 11:27:18 -0000 @@ -41,7 +41,7 @@ #endif /* DFLT_XKBEVD_CONFIG */ #ifndef DFLT_XKB_CONFIG_ROOT -#define DFLT_XKB_CONFIG_ROOT "/usr/X11R6/lib/xkb" +#define DFLT_XKB_CONFIG_ROOT "/usr/share/X11/xkb" #endif #ifndef DFLT_SYS_XKBEVD_CONFIG Index: xserver/xorg/configure.ac =================================================================== RCS file: /cvs/xorg/xserver/xorg/configure.ac,v retrieving revision 1.82 diff -u -r1.82 configure.ac --- xserver/xorg/configure.ac 15 Sep 2005 06:46:05 -0000 1.82 +++ xserver/xorg/configure.ac 16 Sep 2005 11:27:18 -0000 @@ -308,6 +308,9 @@ AC_ARG_WITH(xkb-path, [ --with-xkb-path=PATH ], [ XKBPATH="$withval" ], [ XKBPATH="${datadir}/X11/xkb" ]) +AC_ARG_WITH(xkb-bindir, [ --with-xkb-bindir=PATH ], + [ XKBBINDIR="$withval" ], + [ XKBBINDIR="${bindir}" ]) AC_ARG_WITH(rgb-path, [ --with-rgb-path=PATH ], [ RGBPATH="$withval" ], [ RGBPATH="${datadir}/X11/rgb" ]) @@ -945,6 +948,7 @@ dnl these only go in xkb-config.h (which is shared by the Xorg and Xnest servers) AC_DEFINE(__XKBDEFRULES__, "xorg", [Default XKB rules]) AC_DEFINE_DIR(XKB_BASE_DIRECTORY, XKBPATH, [Path to XKB data]) +AC_DEFINE_DIR(XKB_BIN_DIRECTORY, XKBBINDIR, [Location of xkbcomp]) dnl and the rest of these are generic, so they're in config.h AC_DEFINE(XFree86XDGA, 1, [Build XDGA support])