--- PamVMC/Makefile	2009/02/19 17:39:48	1.3
+++ PamVMC/Makefile	2009/06/12 18:38:51	1.5
@@ -2,9 +2,9 @@
 
 ############################### geant4vmc Makefile ###########################
 
-
 PACKAGE   = PamVMC_fc
 
+
 ifeq ($(PLATFORM),)
 PLATFORM = $(shell root-config --arch)
 endif
@@ -80,8 +80,8 @@
 SHLIBS := ${PAMLIBS}
 # Make include list
 #
-PAMINC :=   -I$(PAMELA_SOFTWARE)/include/yoda -I$(PAMELA_SOFTWARE)/inc -I${ALIROOT}/source
-INCDIR  := -Iinclude $(PAMINC) \
+PAMINC :=   -I$(PAM_INC) -I$(PAM_INC)/yoda 
+INCDIR  := -Iinclude -I$(TOPDIR) \
            -Ical/include \
            -Itrk/include \
            -Itof/include \
@@ -95,7 +95,7 @@
 FINCDIR := -Itrk/include/f77
 # C++ compilation flags
 #
-CXXFLAGS := $(CXXOPTS) -I. $(INCDIR) -I$(ROOT_INCDIR) ${PAMOPTS}
+CXXFLAGS := $(CXXOPTS) -I. $(INCDIR) $(PAMINC) -I$(ROOT_INCDIR) ${PAMOPTS}
 FFLAGS :=  $(FINCDIR)  -fvxt -fno-automatic -Wno-globals 
 
 DEPINC 		+= -I. -I$(ROOT_INCDIR) $(INCDIR)