From 93e50366bb35acf9d6a1a617f9bcb9e212a6a3a0 Mon Sep 17 00:00:00 2001
From: Martin	Diehl <m.diehl@mpie.de>
Date: Fri, 16 Jan 2015 11:19:30 +0000
Subject: [PATCH] fixed automatic determination of compiler

---
 code/Makefile | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/code/Makefile b/code/Makefile
index 8d872e20b..bdace0ca0 100644
--- a/code/Makefile
+++ b/code/Makefile
@@ -24,10 +24,14 @@ COMPILERNAME ?= $(FC)
 LINKERNAME   ?= $(FLINKER)
 
 # MPI compiler wrappers will tell if they are pointing to ifort or gfortran
-COMPILEROUT :=$(shell $(FC) --show)
+COMPILEROUT :=$(shell $(FC) -show)
 # search in FC or COMPILEROUT for gfortran/ifort if not defined
-F90 ?=$(findstring ifort,$(FC) $(COMPILEROUT))
-F90 ?=$(findstring gfortran,$(FC) $(COMPILEROUT))
+ifeq ($(strip $(F90)),)
+	F90 :=$(findstring gfortran,$(FC) $(COMPILEROUT))
+endif
+ifeq ($(strip $(F90)),)
+	F90 :=$(findstring ifort,$(FC) $(COMPILEROUT))
+endif
 
 ifeq "$(FASTBUILD)" "YES"
 OPENMP := OFF
@@ -571,7 +575,7 @@ clean:
 
 .PHONY: help
 help:
-	F90=$(F90)
-	COMPILERNAME=$(COMPILERNAME)
+	F90="$(F90)"
+	COMPILERNAME="$(COMPILERNAME)"
 	COMPILEROUT="$(COMPILEROUT)"