diff options
author | Robin Cook | 2006-03-26 16:03:57 -0100 |
---|---|---|
committer | Robin Cook | 2006-03-26 16:03:57 -0100 |
commit | eb3468571ec5f013c9d0de02d321170dea61cc00 (patch) | |
tree | 2b31e235a21e7629081d693f3f75693927ee95d8 /xorg-data/xkeyboard-config | |
parent | 0cfee7532081eeba2d9c30c40f06cf7983e53ec2 (diff) |
Correct path settings
Diffstat (limited to 'xorg-data/xkeyboard-config')
-rwxr-xr-x | xorg-data/xkeyboard-config/BUILD | 6 | ||||
-rwxr-xr-x | xorg-data/xkeyboard-config/PRE_BUILD | 4 | ||||
-rw-r--r-- | xorg-data/xkeyboard-config/xkeyboard-config-0.7-compiled.diff | 11 |
3 files changed, 18 insertions, 3 deletions
diff --git a/xorg-data/xkeyboard-config/BUILD b/xorg-data/xkeyboard-config/BUILD index 2bc84aae86..d60d8c828c 100755 --- a/xorg-data/xkeyboard-config/BUILD +++ b/xorg-data/xkeyboard-config/BUILD @@ -1,6 +1,6 @@ -OPTS="$OPTS --enable-xkbcomp-symlink" && -OPTS="$OPTS --enable-compat-rules" && -OPTS="$OPTS --with-xkb-base=/usr/lib/X11/xkb" && +OPTS="$OPTS --enable-xkbcomp-symlink" && +OPTS="$OPTS --enable-compat-rules" && +OPTS="$OPTS --with-xkb-base=/usr/share/X11/xkb" && OPTS="$OPTS --with-xkb-rules-symlink=xorg,xfree86" && default_build diff --git a/xorg-data/xkeyboard-config/PRE_BUILD b/xorg-data/xkeyboard-config/PRE_BUILD new file mode 100755 index 0000000000..3b13e6fade --- /dev/null +++ b/xorg-data/xkeyboard-config/PRE_BUILD @@ -0,0 +1,4 @@ +default_pre_build && +cd ${SOURCE_DIRECTORY} && + +patch -p0 < ${SCRIPT_DIRECTORY}/xkeyboard-config-0.7-compiled.diff diff --git a/xorg-data/xkeyboard-config/xkeyboard-config-0.7-compiled.diff b/xorg-data/xkeyboard-config/xkeyboard-config-0.7-compiled.diff new file mode 100644 index 0000000000..318ef08221 --- /dev/null +++ b/xorg-data/xkeyboard-config/xkeyboard-config-0.7-compiled.diff @@ -0,0 +1,11 @@ +--- Makefile.in.orig 2006-03-26 15:34:46.000000000 +0800 ++++ Makefile.in 2006-03-26 15:34:58.000000000 +0800 +@@ -585,8 +585,6 @@ + dnl ACLOCAL_AMFLAGS = -I m4 + + install-compiled: +- rm -f $(DESTDIR)$(xkb_base)/compiled +- ln -sf /var/lib/xkb $(DESTDIR)$(xkb_base)/compiled + + @CREATE_XKBCOMP_SYMLINK_TRUE@install-xkbcomp: + @CREATE_XKBCOMP_SYMLINK_TRUE@ ln -sf $(XKBCOMP) $(DESTDIR)$(xkb_base)/xkbcomp |