Fixes for cmake

[u/mrichter/AliRoot.git] / Makefile

diff --git a/Makefile b/Makefile
index 57bfaa9dd7ea59e6e7ca64d7a93a8ff4e5e6bbe0..2284e0e6781ebad0aa3cd61455afbaee8bdd97b4 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -117,6 +117,10 @@ ALIROOTMODULES := STEER PHOS TRD TPC ZDC MUON PMD FMD TOF ITS \
       JETAN HLT LHC ESDCheck STAT TTherminator CORRFW DPMJET TDPMjet \
       PWG0 PWG1 PWG2 PWG3 PWG4
 
+# Additional generators
+ALIROOTMODULES += TUHKMgen
+ALIROOTMODULES += EPOS
+
 ifneq ($(shell $(ROOTCONFIG) --has-pythia8), no)
 ALIROOTMODULES += PYTHIA8
 endif 
@@ -137,14 +141,6 @@ ifeq ($(findstring SHUTTLE,$(MAKECMDGOALS)),SHUTTLE)
 ALIROOTMODULES += SHUTTLE
 endif
 
-ifeq ($(findstring TUHKMgen,$(MAKECMDGOALS)),TUHKMgen)
-ALIROOTMODULES += TUHKMgen
-endif
-
-ifeq ($(findstring EPOS,$(MAKECMDGOALS)),EPOS)
-ALIROOTMODULES += EPOS
-endif
-
 CERNMODULES := LHAPDF HIJING MICROCERN HERWIG
 ifneq ($(wildcard $(ROOTINCDIR)/TPythia6.h),)
 CERNMODULES += PYTHIA6
@@ -176,7 +172,7 @@ ALILIBS           := -L$(LIBDIR) -lMUON -lTPC -lPMD -lTRD -lFMD -lTOF \
 LIBS := $(ROOTCLIBS) $(ROOTPLIBS) $(SYSLIBS)
 
 ARVERSIONFILE := $(EXPORTDIR)/ARVersion.h
-SVNREV        := $(strip $(shell svn info | grep "Last Changed Rev:" | \
+SVNREV        := $(strip $(shell LANG=C svn info | grep "Last Changed Rev:" | \
                                 cut -d: -f2 ))
 SVNBRANCH     := $(subst //alisoft.cern.ch/AliRoot/,,$(shell svn info | grep "URL:" | cut -d: -f3 ))