Fixex for #90303: Port to the Release --> Fix PROOF-INF/SETUP.C to create PAR files...

diff --git a/CORRFW/Makefile b/CORRFW/Makefile
index b7619f0235597294440018ca58a70b0528dfbf0c..8d13bffecacaa21378ec8e3791a6dcb9ddfc0b1e 100644 (file)
--- a/CORRFW/Makefile
+++ b/CORRFW/Makefile
@@ -1,7 +1,9 @@
 
 include Makefile.arch
 
-default-target: libCORRFW.so
+PACKAGE = CORRFW
+
+default-target: lib$(PACKAGE).so
 
 ALICEINC      = -I.
 
@@ -33,9 +35,12 @@ endif
   endif
 #endif
 
-CXXFLAGS     += $(ALICEINC) -g
+ifeq ($(PLATFORM),macosx)
+     ROOTLIBDIR     := $(shell $(RC) --libdir)
+     PACKLDFLAGS = $(STEERBase_LIBS) $(ESD_LIBS) $(AOD_LIBS) $(ANALYSIS_LIBS) $(ANALYSISalice_LIBS) -L$(ROOTLIBDIR)  -lVMC -lMinuit -lEG -lGeom
+endif
 
-PACKAGE = CORRFW
+CXXFLAGS     += $(ALICEINC) -g
 
 SRCS     = $(wildcard *.cxx)
 HDRS     = $(SRCS:.cxx=.h)
@@ -52,7 +57,11 @@ PARFILE       = $(PACKAGE).par
 lib$(PACKAGE).so: $(OBJS_CORRFW)
        @echo "Linking" $@ ...
        @/bin/rm -f $@
-       $(LD) $(SOFLAGS) $(LDFLAGS) $^ $(OutPutOpt) $@ $(EXPLLINKLIBS)
+ifeq ($(PLATFORM),macosx)
+       $(LD) $(SOFLAGS)$@ $(LDFLAGS) $^ $(OutPutOpt) $@ $(PACKLDFLAGS) $(EXPLLINKLIBS)
+else
+       $(LD) $(SOFLAGS) $(LDFLAGS) $^ $(OutPutOpt) $@ $(PACKLDFLAGS) $(EXPLLINKLIBS)
+endif
        @chmod a+x $@
        @echo "done"
 

diff --git a/CORRFW/PROOF-INF.CORRFW/BUILD.sh b/CORRFW/PROOF-INF.CORRFW/BUILD.sh
index fc9490a6c2debfe17f4f858f82939d600bd6fcce..75991971b337272b1af82113af34332ad21f7582 100755 (executable)
--- a/CORRFW/PROOF-INF.CORRFW/BUILD.sh
+++ b/CORRFW/PROOF-INF.CORRFW/BUILD.sh
@@ -1,3 +1,15 @@
 #! /bin/sh
 
+if [ "" = "clean" ]; then
+   make clean
+   exit 0
+fi
+
 make 
+
+rc=$?
+echo "rc=$?"
+if [ $? != "0" ] ; then
+   exit 1
+fi
+exit 0
\ No newline at end of file

diff --git a/CORRFW/PROOF-INF.CORRFW/SETUP.C b/CORRFW/PROOF-INF.CORRFW/SETUP.C
index c2138c0419d16be0386cfd1fb219bb0592e3131b..327991d8165777322ae4e804754f33fd9488b79d 100644 (file)
--- a/CORRFW/PROOF-INF.CORRFW/SETUP.C
+++ b/CORRFW/PROOF-INF.CORRFW/SETUP.C
@@ -8,4 +8,8 @@ void SETUP()
 
    // Set our location, so that other packages can find us
    gSystem->Setenv("CORRFW_INCLUDE", "CORRFW");
+
+   // Set our lib coordinates, so that other packages can link to us
+   TString lib = TString::Format("-L%s -lCORRFW", gSystem->WorkingDirectory());
+   gSystem->Setenv("CORRFW_LIBS", lib.Data());
 }