diff options
| author | Søren Sandmann Pedersen <sandmann@daimi.au.dk> | 2005-10-06 22:25:35 +0000 |
|---|---|---|
| committer | Søren Sandmann Pedersen <sandmann@daimi.au.dk> | 2005-10-06 22:25:35 +0000 |
| commit | e4ed43c3a6c248ba2b82b8bbf29da537a68407e6 (patch) | |
| tree | 420e6aebd2b5a6464f1853c4fd750f0cca5657c7 | |
| parent | 1614a31a9dad9482ae4526c194c2bae1c4993f8f (diff) | |
symlink.sh:
New files linked:
xorgconf.cpp Options
usb.3 usb_hid_usages
lynx_ppc.S
BUSmemcpy.S IODelay.S PortIO.S SlowBcopy.S
sun_inout.s
xaaTEGlyphBlt.S
xkbcomp/compiled/README
New files excluded:
All of lib/GL/apple
xlibi18n/*/*.mapfile
xxserver/xorg/configure.ac, xkb/Makefile.am:
Install README.compiled in the xkb output dir
| -rw-r--r-- | configure.ac | 11 | ||||
| -rw-r--r-- | xkb/Makefile.am | 5 |
2 files changed, 15 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 0a7df5c1b..4ac1732af 100644 --- a/configure.ac +++ b/configure.ac @@ -1030,8 +1030,19 @@ 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, bindir, [Path to XKB bin dir]) + +# Make sure XKM_OUTPUT_DIR is an absolute path + +XKBOUTPUT_FIRSTCHAR=`echo $XKBOUTPUT | cut -b 1` + +if [[ x$XKBOUTPUT_FIRSTCHAR != x/ ]] ; then + XKBOUTPUT="$XKB_BASE_DIRECTORY/$XKBOUTPUT" +fi + AC_DEFINE_DIR(XKM_OUTPUT_DIR, XKBOUTPUT, [Path to XKB output dir]) +AC_SUBST(XKM_OUTPUT_DIR) + dnl and the rest of these are generic, so they're in config.h AC_DEFINE(XFree86XDGA, 1, [Build XDGA support]) AC_DEFINE(XF86BIGFONT, 1, [Build XFree86 BigFont extension]) diff --git a/xkb/Makefile.am b/xkb/Makefile.am index da92b5288..9efb7398d 100644 --- a/xkb/Makefile.am +++ b/xkb/Makefile.am @@ -2,7 +2,7 @@ noinst_LTLIBRARIES = libxkb.la libxkbstubs.la AM_CFLAGS = $(DIX_CFLAGS) \ -DHAVE_XKB_CONFIG_H - + DDX_SRCS = \ ddxBeep.c \ ddxCtrls.c \ @@ -50,3 +50,6 @@ libxkb_la_SOURCES = $(DDX_SRCS) $(DIX_SRCS) $(XI_SRCS) $(XKBFILE_SRCS) \ libxkbstubs_la_SOURCES = ddxVT.c ddxPrivate.c ddxKillSrv.c EXTRA_DIST = xkb.h xkbDflts.h + +xkbcompileddir = $(XKM_OUTPUT_DIR) +xkbcompiled_DATA = README.compiled |