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/geometry/Makefile.in | |
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/geometry/Makefile.in')
-rw-r--r-- | xorg-server/xkbdata.src/geometry/Makefile.in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xorg-server/xkbdata.src/geometry/Makefile.in b/xorg-server/xkbdata.src/geometry/Makefile.in index 5965542c5..ac6a41475 100644 --- a/xorg-server/xkbdata.src/geometry/Makefile.in +++ b/xorg-server/xkbdata.src/geometry/Makefile.in @@ -189,7 +189,7 @@ dell everex fujitsu \ hhk hp keytronic kinesis \ macintosh microsoft nec \ northgate pc sony thinkpad \ -sun winbook README +sun typematrix winbook README dir_data = $(dist_geom_DATA) dist_dir_DATA = $(subdir).dir @@ -542,7 +542,7 @@ uninstall-am: uninstall-dist_dirDATA uninstall-dist_geomDATA $(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: |