X-Git-Url: http://git.uio.no/git/?p=u%2Fmrichter%2FAliRoot.git;a=blobdiff_plain;f=Makefile;h=1f05acf87d5dc1d4c7f8ac0833af3c28fd8c9f9c;hp=bef26fbd606d7901f0d58a0e9f52c4a443a7d962;hb=f58a4769819ca460dccefd23e8e9e47bf1397d3f;hpb=cf5fccae958aee4e4aa4d87d5e9dd529b5564c98

diff --git a/Makefile b/Makefile
index bef26fbd606..1f05acf87d5 100644
--- a/Makefile
+++ b/Makefile
@@ -112,7 +112,7 @@ endif
 
 ALIROOTMODULES := STEER PHOS TRD TPC ZDC MUON PMD FMD TOF ITS \
       ACORDE HMPID T0 BCM STRUCT EVGEN RALICE VZERO \
-      THijing THbtp EMCAL HBTAN \
+      THijing THbtp EMCAL \
       THerwig TEPEMGEN FASTSIM TPHIC RAW MONITOR ANALYSIS \
       JETAN HLT LHC ESDCheck STAT TTherminator CORRFW DPMJET TDPMjet \
       PWG0 PWG1 PWG2 PWG3 PWG4
@@ -137,8 +137,12 @@ ifeq ($(findstring SHUTTLE,$(MAKECMDGOALS)),SHUTTLE)
 ALIROOTMODULES += SHUTTLE
 endif
 
-ifeq ($(findstring Flugg,$(MAKECMDGOALS)),Flugg)
-ALIROOTMODULES += Flugg
+ifeq ($(findstring TUHKMgen,$(MAKECMDGOALS)),TUHKMgen)
+ALIROOTMODULES += TUHKMgen
+endif
+
+ifeq ($(findstring EPOS,$(MAKECMDGOALS)),EPOS)
+ALIROOTMODULES += EPOS
 endif
 
 CERNMODULES := LHAPDF HIJING MICROCERN HERWIG
@@ -298,9 +302,15 @@ alimdc-rpm: alimdc-static alimdc-specfile
 	$(ROOTALIBDIR)/libfreetype.a $(ROOTALIBDIR)/libpcre.a \
 	alimdc-root/opt/alimdc/lib
 	$(MUTE)rm -rf RPMS
-	$(MUTE)mkdir -p RPMS/i386
-	$(MUTE)rpmbuild --verbose --define "_topdir $(ALICE_ROOT)" --define "_tmppath $(ALICE_ROOT)" -bb $(ALIMDCSPECFILE)
-	$(MUTE)cp -p RPMS/i386/alimdc-*.rpm .
+	$(MUTE)case `uname -m` in \
+	    i?86*)	ALIMDCARCHDIR=i386;;\
+	    ia64*)	ALIMDCARCHDIR=ia64;;\
+	    x86_64*)	ALIMDCARCHDIR=x86_64;;\
+	    *)		echo "Unknown architecture: `uname -m`"; exit 1;;\
+	esac; \
+	mkdir -p RPMS/$$ALIMDCARCHDIR; \
+	rpmbuild --verbose --define "_topdir $(ALICE_ROOT)" --define "_tmppath $(ALICE_ROOT)" -bb $(ALIMDCSPECFILE); \
+	cp -p RPMS/$$ALIMDCARCHDIR/alimdc-*.rpm .;
 	$(MUTE)rm -rf alimdc-root
 	$(MUTE)rm -rf RPMS
 	@echo "***** alimdc RPM created and put $(ALICE_ROOT) folder *****"