aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/xkeyboard-config/xkbrules.mak
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2012-11-20 16:38:12 +0100
committermarha <marha@users.sourceforge.net>2012-11-20 16:38:12 +0100
commit589f5feba1e7968b7318b02f4f2bdea81937f0e1 (patch)
treecb66bfd5efb59eb4b66cee9370cf30a136fc2df4 /xorg-server/xkeyboard-config/xkbrules.mak
parentfc83ab987c84518c31793515c4f99a0df8ccd1cc (diff)
downloadvcxsrv-589f5feba1e7968b7318b02f4f2bdea81937f0e1.tar.gz
vcxsrv-589f5feba1e7968b7318b02f4f2bdea81937f0e1.tar.bz2
vcxsrv-589f5feba1e7968b7318b02f4f2bdea81937f0e1.zip
Now the software can be compiled from inside a cygwin terminal
Diffstat (limited to 'xorg-server/xkeyboard-config/xkbrules.mak')
-rw-r--r--xorg-server/xkeyboard-config/xkbrules.mak6
1 files changed, 4 insertions, 2 deletions
diff --git a/xorg-server/xkeyboard-config/xkbrules.mak b/xorg-server/xkeyboard-config/xkbrules.mak
index 8c1efbec9..c117b30c5 100644
--- a/xorg-server/xkeyboard-config/xkbrules.mak
+++ b/xorg-server/xkeyboard-config/xkbrules.mak
@@ -18,7 +18,9 @@ ifneq ($(DIRFILE),)
PATH:=$(relpath $(MHMAKECONF)\libxcb\src\$(OBJDIR))\;$(relpath $(MHMAKECONF)\libX11\$(OBJDIR))\;$(relpath $(MHMAKECONF)\libXau\$(OBJDIR))\;$(PATH)
export PATH
-$(DIRFILE): extrastuff $(DATA_FILES)
+load_makefile ..\..\..\xkbcomp\makefile MAKESERVER=0 DEBUG=0
+
+$(DIRFILE): extrastuff $(DATA_FILES) ..\..\..\xkbcomp\obj\release\xkbcomp.exe
-del -e $@
- cd $(DESTDIR) & ..\..\xkbcomp.exe -lfhlpR -o $(relpath $@) *
+ cd $(DESTDIR) & ..\..\..\xkbcomp\obj\release\xkbcomp.exe -lfhlpR -o $(relpath $@) *
endif