From e8c43eae922fc9be66eca7cfbaabff561d67b501 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= <matthias@mailaender.name>
Date: Wed, 3 Apr 2013 13:58:27 +0200
Subject: [PATCH] fixes #2938 unbreak make install and SharpFont on Mac

---
 Makefile                        | 2 +-
 thirdparty/SharpFont.dll.config | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index bedb634378..c0d79ea085 100644
--- a/Makefile
+++ b/Makefile
@@ -257,7 +257,7 @@ install: all
 	@$(INSTALL_PROGRAM) thirdparty/ICSharpCode.SharpZipLib.dll $(INSTALL_DIR)
 	@$(INSTALL_PROGRAM) thirdparty/FuzzyLogicLibrary.dll $(INSTALL_DIR)
 	@$(INSTALL_PROGRAM) thirdparty/SharpFont.dll $(INSTALL_DIR)
-	@cp thirdparty/SharpFont.config.dll $(INSTALL_DIR)
+	@cp thirdparty/SharpFont.dll.config $(INSTALL_DIR)
 
 	@echo "#!/bin/sh" 				>  openra
 	@echo 'BINDIR=$$(dirname $$(readlink -f $$0))'	>> openra
diff --git a/thirdparty/SharpFont.dll.config b/thirdparty/SharpFont.dll.config
index 543bb2415f..cf3c1d9868 100644
--- a/thirdparty/SharpFont.dll.config
+++ b/thirdparty/SharpFont.dll.config
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <configuration>
-	<dllmap os="linux" dll="freetype.dll" target="libfreetype.so" />
-	<dllmap os="osx" dll="freetype.dll" target="libfreetype.6.dylib" />
-	<dllmap os="windows" dll="freetype.dll" target="freetype6.dll" />
+	<dllmap dll="freetype.dll">
+		<dllentry os="linux" dll="libfreetype.so.6" />
+		<dllentry os="windows" dll="freetype6.dll" />
+		<dllentry os="osx" dll="/usr/X11/lib/libfreetype.6.dylib" />
+	</dllmap>
 </configuration>
\ No newline at end of file