On Linux, set the default executable suffix to 'uname -m'

[xonotic/netradiant.git] / Makefile

diff --git a/Makefile b/Makefile
index e92030f70ca6d0a249cbfa1fcd82c170ef86aa27..689a61d4b592ac1e4eb26d55bb8c6d9fc3b68627 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)
@@ -171,7 +172,7 @@ ifeq ($(OS),Linux)
        CFLAGS_COMMON += -fPIC
        LDFLAGS_DLL = -fPIC -ldl
        LIBS_COMMON = -lpthread
-       EXE ?= x86
+       EXE ?= $(shell uname -m)
        A = a
        DLL = so
        MWINDOWS =
@@ -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