--- PamVMC/Makefile	2009/02/18 17:25:29	1.2
+++ PamVMC/Makefile	2009/02/19 17:39:48	1.3
@@ -9,9 +9,11 @@
 PLATFORM = $(shell root-config --arch)
 endif
 
-TOPDIR  = $(G4VMC_DIR)
-BINDIR  = $(G4WORKDIR)/tmp/tgt_$(PLATFORM)/$(PACKAGE)
-LIBDIR  = $(G4WORKDIR)/lib/tgt_$(PLATFORM)
+TOPDIR  = $(PWD)
+BINDIR  = $(TOPDIR)/tmp/tgt_$(PLATFORM)/$(PACKAGE)
+LIBDIR  = $(TOPDIR)/lib/tgt_$(PLATFORM)
+#BINDIR  = $(G4WORKDIR)/tmp/tgt_$(PLATFORM)/$(PACKAGE)
+#LIBDIR  = $(G4WORKDIR)/lib/tgt_$(PLATFORM)
 
 ifeq ($(ROOTSYS),)
 ROOT_INCDIR = $(shell root-config --incdir)
@@ -74,15 +76,10 @@
 
 # PAMELA LIBS
 #
-#ALIROOT=/home/nikolas/francesco/aliroot/test/pro/
-ALIROOT=/home/nikolas/francesco/vmc/fluka_vmc/
-#PAMLIBS := -L${PAM_LIB} -lTrkLevel2  -L${ALIROOT}/lib/tgt_linux/ -lTFluka
-PAMLIBS := -L${PAM_LIB} -lTrkLevel2  -L${ALIROOT}/lib/tgt_linux/ -lfluka
+PAMLIBS := -L${PAM_LIB} -lTrkLevel2  
 SHLIBS := ${PAMLIBS}
 # Make include list
 #
-#PAMINC := -I${PAM_INC} -I${PAM_INC}/yoda -I${ALIROOT}/TFluka/
-#PAMINC := -I${PAM_INC} -I${PAM_INC}/yoda -I${ALIROOT}/source/
 PAMINC :=   -I$(PAMELA_SOFTWARE)/include/yoda -I$(PAMELA_SOFTWARE)/inc -I${ALIROOT}/source
 INCDIR  := -Iinclude $(PAMINC) \
            -Ical/include \
@@ -91,7 +88,7 @@
            -Iac/include \
            -Is4/include \
            -Ind/include \
-           -I$(TOPDIR)/include \
+           -I$(G4VMC_DIR)/include \
            -I$(CLHEP_BASE_DIR)/include \
            -Iinclude -I$(G4INCLUDE)
 
@@ -108,8 +105,9 @@
 RM_FILE=$(shell rm -f $(LIBDIR)/resxy_new.root)\
         $(shell rm -f $(LIBDIR)/CalibTrk_00110_000_000.root)
 
+AUXDIR='aux'
 CP_FILE=$(shell mkdir -p  ${LIBDIR})\
-        $(shell cp -rf resxy_new.root CalibTrk_00110_000_000.root ${LIBDIR}/)
+        $(shell cp -rf ${AUXDIR}/resxy_new.root ${AUXDIR}/CalibTrk_00110_000_000.root ${LIBDIR}/)
 
 SLIBRARY	= $(LIBDIR)/lib$(PACKAGE).$(SL)
 ALIBRARY	= $(LIBDIR)/lib$(PACKAGE).a