diff options
| author | marha <marha@users.sourceforge.net> | 2009-09-20 20:25:03 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-09-20 20:25:03 +0000 |
| commit | 6341b97eda007223acfe2f7a64dc2c5718867e0a (patch) | |
| tree | 1793a3e7cda31b9455df3106b60cc01a096b43f7 /xorg-server/xkbdata.src/keycodes | |
| parent | 650fd857a97752ff5ff8b1654ec78b813b78d9c2 (diff) | |
| parent | f3d88db0960f1c23e55f2529764b096ac92d78d9 (diff) | |
| download | vcxsrv-6341b97eda007223acfe2f7a64dc2c5718867e0a.tar.gz vcxsrv-6341b97eda007223acfe2f7a64dc2c5718867e0a.tar.bz2 vcxsrv-6341b97eda007223acfe2f7a64dc2c5718867e0a.zip | |
svn merge https://vcxsrv.svn.sourceforge.net/svnroot/vcxsrv/branches/released .
Diffstat (limited to 'xorg-server/xkbdata.src/keycodes')
| -rw-r--r-- | xorg-server/xkbdata.src/keycodes/Makefile.in | 2 | ||||
| -rw-r--r-- | xorg-server/xkbdata.src/keycodes/sun | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/xorg-server/xkbdata.src/keycodes/Makefile.in b/xorg-server/xkbdata.src/keycodes/Makefile.in index 1df15c3a1..7cf7b7745 100644 --- a/xorg-server/xkbdata.src/keycodes/Makefile.in +++ b/xorg-server/xkbdata.src/keycodes/Makefile.in @@ -550,7 +550,7 @@ uninstall-am: uninstall-dist_dirDATA uninstall-dist_keycodesDATA $(subdir).dir: $(dir_data) -rm -f $@ - here=$$(pwd); cd $(srcdir) && $(XKBCOMP) -lfhlpR -o $${here}/$@ '*' + here=$(abs_builddir); cd $(srcdir) && $(XKBCOMP) -lfhlpR -o $${here}/$@ '*' # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/xorg-server/xkbdata.src/keycodes/sun b/xorg-server/xkbdata.src/keycodes/sun index cdf8694fc..89d7fe66e 100644 --- a/xorg-server/xkbdata.src/keycodes/sun +++ b/xorg-server/xkbdata.src/keycodes/sun @@ -590,7 +590,7 @@ xkb_keycodes "type6_usb" { xkb_keycodes "type6tuv_usb" { include "sun(type6_usb)" -// <LSGT> = 94; + <LSGT> = 94; // <BKSL> = 51; }; |