updated merging function (Michele)

[u/mrichter/AliRoot.git] / CORRFW / libCORRFW.pkg

diff --git a/CORRFW/libCORRFW.pkg b/CORRFW/libCORRFW.pkg
index 7be68e355f9c5175b4e1938374a0b1166a479738..08baaf01b9bc01885374951b42da6e5511521580 100644 (file)
--- a/CORRFW/libCORRFW.pkg
+++ b/CORRFW/libCORRFW.pkg
@@ -24,12 +24,10 @@ SRCS = AliCFFrame.cxx \
        AliCFV0TopoCuts.cxx \
        AliCFUnfolding.cxx
 
-CHECKALIEN = $(shell root-config --has-alien)
 ifeq (yes,$(CHECKALIEN))
 PACKCXXFLAGS := $(CXXFLAGS) -DWITHALIEN
 endif
 
-CHECKXML = $(shell root-config --has-xml)
 ifeq (yes,$(CHECKXML))
 PACKCXXFLAGS += $(CXXFLAGS) -DWITHXML
 CINTFLAGS += -DWITHXML
@@ -41,10 +39,12 @@ DHDR= CORRFWLinkDef.h
 
 EXPORT:=$(SRCS:.cxx=.h)
 
+EINCLUDE:= ANALYSIS
+
 ifeq (win32gcc,$(ALICE_TARGET))
 PACKSOFLAGS:= $(SOFLAGS) -L$(ALICE_ROOT)/lib/tgt_$(ALICE_TARGET) \
                          -lSTEERBase -lANALYSIS -lESD -lAOD \
-                         -L$(shell root-config --libdir) -lEG
+                         -L$(ROOTLIBDIR) -lEG
 endif