absolute path to datasets remobed

 Ruediger Haake

diff --git a/LHAPDF/CMakeliblhapdf.pkg b/LHAPDF/CMakeliblhapdf.pkg
index d2095e4db76a88d425be4e27a5f633fe476135a1..12ae38098a41947b7b5b27b36f7a89f7944b4917 100644 (file)
--- a/LHAPDF/CMakeliblhapdf.pkg
+++ b/LHAPDF/CMakeliblhapdf.pkg
@@ -47,7 +47,8 @@ else()
                set ( PACKFFLAGS "${FFLAGS} -ffree-form")
 endif( ALICE_TARGET STREQUAL "solarisCC5")
 
-set( PACKCXXFLAGS "${CXXFLAGS} -DDEFAULTPREFIXPATH=\\\"NONE\\\" -DDEFAULTLHAPATH=\\\"../AliRoot/LHAPDF/PDFsets\\\"" )
+set( PACKCXXFLAGS "${CXXFLAGS} -DDEFAULTPREFIXPATH=\\\"NONE\\\" -DDEFAULTLHAPATH=\\\"${ALICE_ROOT}/LHAPDF/PDFsets\\\"" )
+
 
 set ( EXPORT AliStructFuncType.h)
 

diff --git a/LHAPDF/lhapdf5.5.1/src/getdatapath.cc b/LHAPDF/lhapdf5.5.1/src/getdatapath.cc
index 4c7740fc9b08e019bd643bc17c63ff60f70999ee..d57b9bc4dadaf0bd7406769ec44b593f3d822bab 100644 (file)
--- a/LHAPDF/lhapdf5.5.1/src/getdatapath.cc
+++ b/LHAPDF/lhapdf5.5.1/src/getdatapath.cc
@@ -74,7 +74,7 @@ extern "C" {
     string tmp = sharedir + "/lhapdf/PDFsets";
     string test1 = tmp + "/cteq6.LHpdf";
     if (access(test1.c_str(), R_OK) != 0) {
-      tmp = string(DEFAULTLHAPATH) + "/lhapdf/PDFsets";
+      tmp = string(DEFAULTLHAPATH);
     }
     assert(tmp.length() <= (unsigned) length);
     strncpy(datapath, tmp.c_str(), length);

diff --git a/LHAPDF/lhapdf5.5.1/src/getdatapath.cxx b/LHAPDF/lhapdf5.5.1/src/getdatapath.cxx
index b390be0033ada6d265c033313d7d39c6321afcb1..8d1384ceea391cd5a51d4b5a93e430a898d8157b 100644 (file)
--- a/LHAPDF/lhapdf5.5.1/src/getdatapath.cxx
+++ b/LHAPDF/lhapdf5.5.1/src/getdatapath.cxx
@@ -71,10 +71,10 @@ extern "C" {
     BrInitError error;
     br_init_lib(&error);
     string sharedir = br_find_data_dir(DEFAULTLHAPATH);
-    string tmp = sharedir + "/lhapdf/PDFsets";
+    string tmp = sharedir;
     string test1 = tmp + "/cteq6.LHpdf";
     if (access(test1.c_str(), R_OK) != 0) {
-      tmp = string(DEFAULTLHAPATH) + "/lhapdf/PDFsets";
+      tmp = string(DEFAULTLHAPATH);
     }
     assert(tmp.length() <= (unsigned) length);
     strncpy(datapath, tmp.c_str(), length);