From: kir <kir@f7af4fe6-9843-0410-8265-dc069ae4e863>
Date: Wed, 21 Feb 2007 14:42:10 +0000 (+0000)
Subject: Private make file now works without root in path
X-Git-Url: http://git.uio.no/git/?a=commitdiff_plain;h=025aa9c7de622dec5f735e347661fffdf2c42a73;p=u%2Fmrichter%2FAliRoot.git

Private make file now works without root in path
---

diff --git a/HMPID/Hmake b/HMPID/Hmake
index b008622a18c..812466f004a 100644
--- a/HMPID/Hmake
+++ b/HMPID/Hmake
@@ -9,7 +9,7 @@ SrcSim   	:=$(SRCS)
 include	lib$(Module)rec.pkg
 SrcRec   	:=$(SRCS)
 
-RootTarget      :=$(shell root-config --arch)
+RootTarget      :=$(shell $(ROOTSYS)/bin/root-config --arch)
 DirOut	        :=/tmp/$(USER)_$(Module)_obj
 LibBase		:=$(LIB_MY)/lib$(Module)base.so
 LibSim		:=$(LIB_MY)/lib$(Module)sim.so
@@ -40,11 +40,11 @@ DepFile	      := $(DirOut)/$(Module).depend
 
 ifeq ($(RootTarget),linuxicc)
  Compiler    :=icc
- CompilerOpt :=-fpstkchk -I$(shell root-config --incdir) -I$(ALICE_ROOT)/include
+ CompilerOpt :=-fpstkchk -I$(shell $(ROOTSYS)/bin/root-config --incdir) -I$(ALICE_ROOT)/include
  LibOpt      :=-g -shared -Wl
 else
  Compiler    :=g++
- CompilerOpt :=-g -W -Wall -Werror -Woverloaded-virtual -fPIC -pipe -fmessage-length=0 -Wno-long-long -pedantic-errors -ansi -Dlinux -D`uname` -I$(shell root-config --incdir) -I$(ALICE_ROOT)/include
+ CompilerOpt :=-g -W -Wall -Werror -Woverloaded-virtual -fPIC -pipe -fmessage-length=0 -Wno-long-long -pedantic-errors -ansi -Dlinux -D`uname` -I$(shell $(ROOTSYS)/bin/root-config --incdir) -I$(ALICE_ROOT)/include
  LibOpt      :=-g -shared -Wl
 endif
 
@@ -74,19 +74,19 @@ $(DepFile):	$(HdrBase) $(HdrSim) $(HdrRec)
 	@[ -d $(LIB_MY) ] || mkdir -p $(LIB_MY)
 	@touch $(DepFile)
 	@echo "Generating dependency $@"
-	$(Mute)rmkdepend -f$(DepFile) -p$(DirOut)/ -- $(CompilerOpt) -- $(SrcBase) $(SrcSim) $(SrcRec) 2>/dev/null
+	$(Mute)$(ROOTSYS)/bin/rmkdepend -f$(DepFile) -p$(DirOut)/ -- $(CompilerOpt) -- $(SrcBase) $(SrcSim) $(SrcRec) 2>/dev/null
 
 $(DictSrcBase):  $(HdrBase)
 	@echo "Generating $@"
-	$(Mute)rootcint -f $@ -c $(filter -I%,$(CompilerOpt)) $^
+	$(Mute)$(ROOTSYS)/bin/rootcint -f $@ -c $(filter -I%,$(CompilerOpt)) $^
         
 $(DictSrcSim):  $(HdrSim)
 	@echo "Generating $@"
-	$(Mute)rootcint -f $@ -c $(filter -I%,$(CompilerOpt)) $^
+	$(Mute)$(ROOTSYS)/bin/rootcint -f $@ -c $(filter -I%,$(CompilerOpt)) $^
         
 $(DictSrcRec):  $(HdrRec)
 	@echo "Generating $@"
-	$(Mute)rootcint -f $@ -c $(filter -I%,$(CompilerOpt)) $^
+	$(Mute)$(ROOTSYS)/bin/rootcint -f $@ -c $(filter -I%,$(CompilerOpt)) $^
 
 $(DictObjBase) : $(DictSrcBase)
 	@echo "Compiling $^"