diff options
| author | Eric Sandall | 2011-08-24 11:12:02 -0700 |
|---|---|---|
| committer | Eric Sandall | 2011-08-24 11:12:02 -0700 |
| commit | 4df120d89abbe077f79de4acf8932a9a79842bbc (patch) | |
| tree | 2f4f8e62dc451c4fb032ec0b0545d9fd1f940697 /xorg-data/xkeyboard-config/BUILD | |
| parent | 2a53931f090a4a7f218f7f2a29aa55b22a2b4473 (diff) | |
| parent | 590e9457a5b4741e69b9956983fdf68d74adb073 (diff) | |
Merge branch 'master' into devel-xorg-modular
Conflicts:
xorg-data/xkeyboard-config/BUILD
xorg-data/xkeyboard-config/HISTORY
Diffstat (limited to 'xorg-data/xkeyboard-config/BUILD')
| -rwxr-xr-x | xorg-data/xkeyboard-config/BUILD | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/xorg-data/xkeyboard-config/BUILD b/xorg-data/xkeyboard-config/BUILD index 792c7724c9..4fe83eb881 100755 --- a/xorg-data/xkeyboard-config/BUILD +++ b/xorg-data/xkeyboard-config/BUILD @@ -1,5 +1,6 @@ -OPTS="--enable-compat-rules \ - --with-xkb-base=$INSTALL_ROOT/usr/share/X11/xkb \ ---with-xkb-rules-symlink=xorg,xfree86" && +#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 |