PAR: get Makefile.arch from current ROOT inst

We cannot use our current one as we are creating PARfiles on one machine
but we are using them on another

diff --git a/cmake/GenParFile.cmake b/cmake/GenParFile.cmake
index 670eb7df63a05c60d842374dec02cbd82e1cbd1a..7ce53ab494bff5898e11f3f616be40e05b464787 100644 (file)
--- a/cmake/GenParFile.cmake
+++ b/cmake/GenParFile.cmake
@@ -67,7 +67,6 @@ macro(add_target_parfile PARMODULE PARSOURCES PARHEADERS PARLINKDEF PARLIBDEPS)
   # Target for creating PARfile (would stop after the first failed COMMAND)
   add_custom_target("${PARMODULE}.par"
     COMMAND cd ${CMAKE_CURRENT_SOURCE_DIR} && cp ${PARSOURCES} ${PARHEADERS} ${PARLINKDEF} ${PARDIR}/
-    COMMAND cmake -E copy ${ROOT_ETCDIR}/Makefile.arch ${PARDIR}/
     COMMAND tar -C ${PARDIR}/.. -czf ${PARDIR}/../${PARMODULE}.par ${PARMODULE}/
   )
 

diff --git a/cmake/PARfiles/Makefile.in b/cmake/PARfiles/Makefile.in
index d580f11491a3cea1496f5d363119ae66bf917fbf..dbc9441cebf472802da27a4b29a8ee0be2f27bd3 100644 (file)
--- a/cmake/PARfiles/Makefile.in
+++ b/cmake/PARfiles/Makefile.in
@@ -1,7 +1,7 @@
 # Makefile for @PARMODULE@ -- automatically generated
 
-# From ROOT
-include Makefile.arch
+# Include this file from the ROOT installed on the system where we are using the PARfile
+include $(shell root-config --etcdir)/Makefile.arch
 
 # Name of this module
 PAR_MODULE := @PARMODULE@
@@ -10,7 +10,7 @@ PAR_MODULE := @PARMODULE@
 PAR_LIBDEPS := @PARLIBDEPS@
 
 # Include paths
-PAR_INCLUDES = -I. -I$(ALICE_ROOT)/include -I$(ALICE_PHYSICS)/include -I$(ROOTSYS)/include
+PAR_INCLUDES = -I. -I$(ALICE_ROOT)/include -I$(ALICE_PHYSICS)/include -I$(shell root-config --incdir)
 
 # Get C++ flags form ROOT
 PAR_CXXFLAGS = $(CXXFLAGS) $(PAR_INCLUDES)