revert makefile for darwin

Author: xinyu

.gitignore

@@ -48,6 +48,7 @@ src/mpgrafic/mpgrafic-0.2/src/mpgrafic
 src/mpgrafic/mpgrafic-0.2/src/*.dat
 src/mpgrafic/mpgrafic-0.2/stamp-h1
 src/mpgrafic/degraf/autom4te.cache/
+src/enzo/Make.mach.mymac
 
 src/P-GroupFinder/P-GroupFinder
 

src/enzo/Make.mach.darwin

@@ -35,30 +35,31 @@ MACH_FILE  = Make.mach.darwin
 # Install paths (local variables)
 #-----------------------------------------------------------------------
 
-LOCAL_PACKAGES       = /opt/local/bin
+LOCAL_PACKAGES       = /usr/local
 
 # This will not work on OSX Lion or newer.  You may wany to try installing
 # openmpi via macports.  
-LOCAL_MPI_INSTALL    = /opt/local
-LOCAL_FC_INSTALL     = /opt/local
-LOCAL_HDF5_INSTALL   = /opt/hdf5
+LOCAL_MPI_INSTALL    = /usr/local
+LOCAL_FC_INSTALL     = /usr/local
+LOCAL_HDF5_INSTALL   = $(YT_DEST)
 LOCAL_SZIP_INSTALL   = $(LOCAL_PACKAGES)
 LOCAL_HYPRE_INSTALL  = $(HOME)
 LOCAL_PYTHON_INSTALL = $(YT_DEST)
+LOCAL_GRACKLE_INSTALL = /usr/local
 
 #-----------------------------------------------------------------------
 # Compiler settings
 #-----------------------------------------------------------------------
 
-MACH_CPP       = /opt/local/bin/cpp
+MACH_CPP       = /usr/bin/cpp
 
 # With MPI
 
 MACH_CC_MPI    = mpicc
-MACH_CXX_MPI   = mpicxx
+MACH_CXX_MPI   = mpic++ 
 MACH_FC_MPI    = gfortran 
 MACH_F90_MPI   = gfortran
-MACH_LD_MPI    = mpicxx 
+MACH_LD_MPI    = mpic++ 
 MACH_CUDACOMPILER = /usr/local/cuda/bin/nvcc
 
 # Without MPI
@@ -112,25 +113,30 @@ LOCAL_INCLUDES_PYTHON = -I$(LOCAL_PYTHON_INSTALL)/include/python2.6/ \
 LOCAL_INCLUDES_HYPRE  = 
 LOCAL_INCLUDES_PAPI   = # PAPI includes
 LOCAL_INCLUDES_CUDA   = -I/Developer/CUDA/common/inc
+LOCAL_INCLUDES_GRACKLE = -I$(LOCAL_GRACKLE_INSTALL)/include
 
 MACH_INCLUDES         = $(LOCAL_INCLUDES_HDF5) $(LOCAL_INCLUDES_CUDA)
 MACH_INCLUDES_PYTHON  = $(LOCAL_INCLUDES_PYTHON)
 MACH_INCLUDES_MPI     = $(LOCAL_INCLUDES_MPI)
 MACH_INCLUDES_HYPRE   = $(LOCAL_INCLUDES_HYPRE)
+MACH_INCLUDES_GRACKLE  = $(LOCAL_INCLUDES_GRACKLE)
 
 #-----------------------------------------------------------------------
 # Libraries
 #-----------------------------------------------------------------------
 
-LOCAL_LIBS_MACH   = -L/opt/local/lib/libgcc -lgfortran.5 
+LOCAL_LIBS_MACH   = -L$(LOCAL_FC_INSTALL)/lib -lgfortran 
                     #-L$(HOME)/yt/enzolib/enzolib -lproblemtype_handler
-LOCAL_LIBS_HDF5   = -L$(LOCAL_HDF5_INSTALL)/lib -lhdf5 $(MACH_DEFINES)
+LOCAL_LIBS_HDF5   = -L$(LOCAL_HDF5_INSTALL)/lib -lhdf5
 LOCAL_LIBS_PYTHON = -lpython2.6
 LOCAL_LIBS_PYTHON = -framework Python 
 LOCAL_LIBS_CUDA   = -L/usr/local/cuda/lib/ -lcudart
+LOCAL_LIBS_GRACKLE = -L$(LOCAL_GRACKLE_INSTALL)/lib -lgrackle
+LOCAL_LIBS_HYPRE = -L$(LOCAL_HYPRE_INSTALL)/lib -lhypre
 
 MACH_LIBS        = $(LOCAL_LIBS_HDF5) $(LOCAL_LIBS_MACH) 
 MACH_LIBS_PYTHON  = $(LOCAL_LIBS_PYTHON)
 MACH_LIBS_MPI    = $(LOCAL_LIBS_MPI)
 MACH_LIBS_HYPRE  = $(LOCAL_LIBS_HYPRE)
 MACH_LIBS_PAPI    = $(LOCAL_LIBS_PAPI)
+MACH_LIBS_GRACKLE = $(LOCAL_LIBS_GRACKLE)