diff --git a/src/ToDo.txt b/src/ToDo.txt index 31fedc45..f121d901 100644 --- a/src/ToDo.txt +++ b/src/ToDo.txt @@ -1,4 +1,8 @@ -2007/11/28 +#------------------------------------------------------------------------ +# ToDo.txt +# Andreas Suter, 2007/11/28 +# $Id$ +#------------------------------------------------------------------------ --------------------- short term: diff --git a/src/classes/BUILD b/src/classes/BUILD index d26b87a7..182cf8b6 100644 --- a/src/classes/BUILD +++ b/src/classes/BUILD @@ -1,10 +1,10 @@ ************************************************************* - + Build instructions for the shared library libPMusr.so - + Andreas Suter, 2008/01/08 $Id$ - + ************************************************************* At the moment a lot of the build stuff has to be done manually. @@ -14,7 +14,8 @@ automatically. Required packages: * ROOT >= 5.16 : needed for read/write some data files, plotting, ... -* Minuit2 >= 5.08 : needed for fitting + ROOT needs to be compiled with Minuit2 enabled + (configure ... --enable-minuit2 ...) * Spirit >= 1.8.5 : needed for parsing (this is part of the boost lib, and hence installed on most linux machines). The boost libs are platform independent and hence it should be easy in @@ -27,5 +28,3 @@ make -f Makefile.PMusr than as root make -f Makefile.PMusr install - - diff --git a/src/classes/Makefile.PMusr b/src/classes/Makefile.PMusr index 69c48eb8..3e23593b 100644 --- a/src/classes/Makefile.PMusr +++ b/src/classes/Makefile.PMusr @@ -42,7 +42,7 @@ ifeq ($(OS),LINUX) CXX = g++ CXXFLAGS = -g -Wall -fPIC PMUSRPATH = ../include -MNPATH = /usr/local/include +MNPATH = $(ROOTSYS)/include INCLUDES = -I $(PMUSRPATH) -I $(MNPATH) LD = g++ LDFLAGS = -g @@ -70,7 +70,7 @@ GLIBS = $(ROOTGLIBS) -lXMLParser # PSI libs PSILIBS = -lTLemRunHeader # Minuit2 lib -MNLIB = -L/usr/local/lib -lMinuit2Base +MNLIB = -L$(ROOTSYS)/lib -lMinuit2 # some definitions: headers, sources, objects,... @@ -135,4 +135,4 @@ install: all ifeq ($(OS),LINUX) cp -pv $(SHLIB) $(ROOTSYS)/lib cp -pv $(PMUSRPATH)/*.h $(ROOTSYS)/include -endif \ No newline at end of file +endif