Fix up Makefile for PETSc ignoring already set PETSC_DIR