diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | configure.ac | 10 | ||||
| -rw-r--r-- | xkb/Makefile.am | 2 |
3 files changed, 18 insertions, 3 deletions
@@ -1,3 +1,12 @@ +2005-11-20 Alan Coopersmith <alan.coopersmith@sun.com> + + * configure.ac: + * xkb/Makefile.am: + Make sure XKM_OUTPUT_DIR (used in code) ends in / (so paths don't + get hosed when appending file names) but XKB_COMPILED_DIR (used + in Makefiles) does not so install-sh -d doesn't get confused when + the directory already exists. + 2005-11-19 Alan Coopersmith <alan.coopersmith@sun.com> * configure.ac: diff --git a/configure.ac b/configure.ac index 692f30754..7531ed390 100644 --- a/configure.ac +++ b/configure.ac @@ -353,7 +353,7 @@ AC_ARG_WITH(xkb-path, AS_HELP_STRING([--with-xkb-path=PATH], [Path to XK [ XKBPATH="${datadir}/X11/xkb" ]) AC_ARG_WITH(xkb-output, AS_HELP_STRING([--with-xkb-output=PATH], [Path to XKB output dir (default: ${datadir}/X11/xkb/compiled)]), [ XKBOUTPUT="$withval" ], - [ XKBOUTPUT="compiled/" ]) + [ XKBOUTPUT="compiled" ]) AC_ARG_WITH(rgb-path, AS_HELP_STRING([--with-rgb-path=PATH], [Path to RGB database (default: ${datadir}/X11/rgb)]), [ RGBPATH="$withval" ], [ RGBPATH="${datadir}/X11/rgb" ]) @@ -1156,9 +1156,15 @@ if [[ x$XKBOUTPUT_FIRSTCHAR != x/ ]] ; then XKBOUTPUT="$XKB_BASE_DIRECTORY/$XKBOUTPUT" fi +# XKM_OUTPUT_DIR (used in code) must end in / or file names get hosed +# XKB_COMPILED_DIR (used in Makefiles) must not or install-sh gets confused + +XKBOUTPUT=`echo $XKBOUTPUT/ | sed 's|/*$|/|'` +XKB_COMPILED_DIR=`echo $XKBOUTPUT | sed 's|/*$||'` + AC_DEFINE_DIR(XKM_OUTPUT_DIR, XKBOUTPUT, [Path to XKB output dir]) -AC_SUBST(XKM_OUTPUT_DIR) +AC_SUBST(XKB_COMPILED_DIR) dnl and the rest of these are generic, so they're in config.h AC_DEFINE(XFreeXDGA, 1, [Build XDGA support]) diff --git a/xkb/Makefile.am b/xkb/Makefile.am index 522d0436d..305ce5870 100644 --- a/xkb/Makefile.am +++ b/xkb/Makefile.am @@ -51,5 +51,5 @@ libxkbstubs_la_SOURCES = ddxVT.c ddxPrivate.c ddxKillSrv.c EXTRA_DIST = xkb.h xkbDflts.h -xkbcompileddir = $(XKM_OUTPUT_DIR) +xkbcompileddir = $(XKB_COMPILED_DIR) dist_xkbcompiled_DATA = README.compiled |