From 875084f7b2325608db756e3628ac409fe0f9abe7 Mon Sep 17 00:00:00 2001
From: Jan Lindemann <jan@jannet.de>
Date: Wed, 4 Apr 2012 18:32:14 +0000
Subject: [PATCH] defs.mk: Fix CONTRIB_LIBS_PATH

---
 make/defs.mk | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/make/defs.mk b/make/defs.mk
index 9e567270..a8845b99 100644
--- a/make/defs.mk
+++ b/make/defs.mk
@@ -27,6 +27,9 @@ FLAVOUR_PREFIX        ?= win32-
 FLAVOUR_SUFFIX        ?= -win32
 FLAVOUR_PATH_PREFIX   ?= win32/
 FLAVOUR_PATH_SUFFIX   ?= /win32
+  ifneq ($(wildcard /usr/bin/i686-w64-mingw32-gcc),)
+    MINGW_SYS_ROOT      ?= /usr/i686-w64-mingw32/sys-root/mingw
+  endif
 endif
 
 # ----- executables
@@ -149,11 +152,12 @@ BUILD_CPPFLAGS        += -DVERSION=$(HEX_VERSION)
 
 ifeq ($(TARGET),mingw)
  ifneq ($(wildcard /usr/bin/i686-w64-mingw32-gcc),)
+  MINGW_SYS_ROOT      ?= /usr/i686-w64-mingw32/sys-root/mingw
   CROSS_TOOL_DIR      ?=
   CROSS_TOOL_BIN_PREFIX ?= $(CROSS_TOOL_DIR)/usr/bin/i686-w64-mingw32-
-  PROJECT_LDFLAGS     += -L/usr/i686-w64-mingw32/sys-root/mingw/lib
-  PROJECT_CFLAGS      += -L/usr/i686-w64-mingw32/sys-root/mingw/include
-  PROJECT_CPPFLAGS    += -L/usr/i686-w64-mingw32/sys-root/mingw/include
+  PROJECT_LDFLAGS     += -L$(MINGW_SYS_ROOT)/lib
+  PROJECT_CFLAGS      += -L$(MINGW_SYS_ROOT)/include
+  PROJECT_CPPFLAGS    += -L$(MINGW_SYS_ROOT)/include
  else
   CROSS_TOOL_DIR      ?= /opt/cross-tools
   CROSS_TOOL_BIN_PREFIX ?= $(CROSS_TOOL_DIR)/bin/i686-pc-mingw32-
@@ -292,7 +296,11 @@ INSTALLED_DOC         ?= $(addprefix $(INSTALL_DOCDIR)/,$(DOCS))
 BUILD_LIBDIR           = $(TOPDIR)/lib
 LOCAL_LIBS            += $(CONTRIB_LIBS) $(PLUGIN)
 ifeq ($(TARGET),mingw)
-CONTRIB_LIBS_PATH     += $(CROSS_TOOL_DIR)/bin
+  ifeq ($(MINGW_SYS_ROOT),)
+    CONTRIB_LIBS_PATH     += $(CROSS_TOOL_DIR)/bin
+  else
+    CONTRIB_LIBS_PATH     += $(MINGW_SYS_ROOT)/lib
+  endif
 endif
 
 LIBTYPE               ?= shared