aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/xkeyboard-config
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2012-06-27 14:53:02 +0200
committermarha <marha@users.sourceforge.net>2012-06-27 14:53:02 +0200
commit36c56ad1e4a435519f736670c628ae3593233205 (patch)
tree60e5045a779c6a3f9cf415b102374b501d117a14 /xorg-server/xkeyboard-config
parentb937d84c24f93729b8cab22538e72ff3e40b1794 (diff)
downloadvcxsrv-36c56ad1e4a435519f736670c628ae3593233205.tar.gz
vcxsrv-36c56ad1e4a435519f736670c628ae3593233205.tar.bz2
vcxsrv-36c56ad1e4a435519f736670c628ae3593233205.zip
Solved compile problems when compiled from a clean tree
Diffstat (limited to 'xorg-server/xkeyboard-config')
-rw-r--r--xorg-server/xkeyboard-config/xkbrules.mak4
1 files changed, 4 insertions, 0 deletions
diff --git a/xorg-server/xkeyboard-config/xkbrules.mak b/xorg-server/xkeyboard-config/xkbrules.mak
index 7e8f11fbc..8c1efbec9 100644
--- a/xorg-server/xkeyboard-config/xkbrules.mak
+++ b/xorg-server/xkeyboard-config/xkbrules.mak
@@ -14,6 +14,10 @@ $(DESTDIR)\%: %
ifneq ($(DIRFILE),)
.PHONY: extrastuff
+#bdftopcf is dependent on libX11.dll, so we need to add the directory of the libX11 dll to the path env variable
+PATH:=$(relpath $(MHMAKECONF)\libxcb\src\$(OBJDIR))\;$(relpath $(MHMAKECONF)\libX11\$(OBJDIR))\;$(relpath $(MHMAKECONF)\libXau\$(OBJDIR))\;$(PATH)
+export PATH
+
$(DIRFILE): extrastuff $(DATA_FILES)
-del -e $@
cd $(DESTDIR) & ..\..\xkbcomp.exe -lfhlpR -o $(relpath $@) *