Fedora support patch by maci (make DLL finding work with Fedora's mingw)

[xonotic/netradiant.git] / Makefile

diff --git a/Makefile b/Makefile
index 7de95a8caa6b4cb8f6d5f371114d6296ceebe4cb..b4174339e8e6ca3d2a4539cfcd533ba669bb2124 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -97,6 +97,7 @@ endif
 # these are used on Win32 only
 GTKDIR             ?= $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) $(PKGCONFIG) gtk+-2.0 --variable=prefix $(STDERR_TO_DEVNULL))
 WHICHDLL           ?= which
+DLLINSTALL         ?= install-dlls.sh
 
 # alias mingw32 OSes
 ifeq ($(OS),MINGW32_NT-6.0)
@@ -331,7 +332,7 @@ dependencies-check:
        }; \
        $(ECHO) checking that the dependencies exist; \
        checkheader libjpeg8-dev jpeglib.h jpeg_set_defaults "$(CPPFLAGS_JPEG)" "$(LIBS_JPEG)"; \
-       checkheader libglib2.0-dev glib/gutils.h g_path_is_absolute "$(CPPFLAGS_GLIB)" "$(LIBS_GLIB)"; \
+       checkheader libglib2.0-dev glib.h g_path_is_absolute "$(CPPFLAGS_GLIB)" "$(LIBS_GLIB)"; \
        checkheader libxml2-dev libxml/xpath.h xmlXPathInit "$(CPPFLAGS_XML)" "$(LIBS_XML)"; \
        checkheader libpng12-dev png.h png_create_read_struct "$(CPPFLAGS_PNG)" "$(LIBS_PNG)"; \
        checkheader "mesa-common-dev (or another OpenGL library)" GL/gl.h glClear "$(CPPFLAGS_GL)" "$(LIBS_GL)"; \
@@ -1031,7 +1032,7 @@ install-data: binaries
 .PHONY: install-dll
 ifeq ($(OS),Win32)
 install-dll: binaries
-       MKDIR="$(MKDIR)" CP="$(CP)" CAT="$(CAT)" GTKDIR="$(GTKDIR)" WHICHDLL="$(WHICHDLL)" INSTALLDIR="$(INSTALLDIR)" $(SH) install-dlls.sh
+       MKDIR="$(MKDIR)" CP="$(CP)" CAT="$(CAT)" GTKDIR="$(GTKDIR)" WHICHDLL="$(WHICHDLL)" INSTALLDIR="$(INSTALLDIR)" $(SH) $(DLLINSTALL) 
 else
 ifeq ($(OS),Darwin)
 install-dll: binaries