--- petsc-2.3.3-p2/bmake/common/siteconf.orig	2007-06-19 18:19:08.000000000 -0300
+++ petsc-2.3.3-p2/bmake/common/siteconf	2007-06-19 18:19:08.000000000 -0300
@@ -0,0 +1,4 @@
+#
+# Placeholder for site specific configuration
+# 
+
--- petsc-2.3.3-p2/bmake/common/variables.orig	2007-05-23 20:30:02.000000000 -0300
+++ petsc-2.3.3-p2/bmake/common/variables	2007-06-20 11:49:34.000000000 -0300
@@ -8,9 +8,19 @@
 # PETSC_[C,F]CPPFLAGS    -  preprocessor flags for *.c, *.F preprocessing
 # PETSC_[C,F]SH_LIB_PATH - linker_add_sh_lib_path:sh_lib_path pairs for all the shared library locations
 #
-PETSC_LIB_DIR	    = ${PETSC_DIR}/lib/${PETSC_ARCH}
-PETSC_INCLUDE	    = -I${PETSC_DIR} -I${PETSC_DIR}/bmake/${PETSC_ARCH} -I${PETSC_DIR}/include \
-                        ${PACKAGES_INCLUDES} ${TAU_DEFS} ${TAU_INCLUDE} ${PETSC_BLASLAPACK_FLAGS}
+PETSC_LIB_DIR = ${PETSC_LIB_DIR_ARCH}
+PETSC_INCLUDE = ${PETSC_INCLUDE_BASIC} ${PETSC_INCLUDE_EXTRA}
+
+PETSC_LIB_DIR_ROOT       = ${PETSC_DIR}
+PETSC_LIB_DIR_COMMON     = ${PETSC_LIB_DIR_ROOT}/lib
+PETSC_LIB_DIR_ARCH       = ${PETSC_LIB_DIR_COMMON}/${PETSC_ARCH}
+
+PETSC_INCLUDE_DIR_ROOT   = ${PETSC_DIR}
+PETSC_INCLUDE_DIR_COMMON = ${PETSC_INCLUDE_DIR_ROOT}/include
+PETSC_INCLUDE_DIR_CONFIG = ${PETSC_DIR}/bmake
+PETSC_INCLUDE_DIR_ARCH   = ${PETSC_INCLUDE_DIR_CONFIG}/${PETSC_ARCH}
+PETSC_INCLUDE_BASIC      = -I${PETSC_INCLUDE_DIR_ROOT} -I${PETSC_INCLUDE_DIR_ARCH} -I${PETSC_INCLUDE_DIR_COMMON}
+PETSC_INCLUDE_EXTRA      = ${PACKAGES_INCLUDES} ${TAU_DEFS} ${TAU_INCLUDE} ${PETSC_BLASLAPACK_FLAGS}
 
 PETSC_CC_INCLUDES = ${PETSC_INCLUDE}
 PETSC_FC_INCLUDES = ${PETSC_INCLUDE}
@@ -82,7 +92,7 @@
 PETSC_FORTRAN_LIB = 
 
 #-----------------------------------------------------------------------------------------
-PETSC_LIB_DIR_COMPLEX = ${PETSC_DIR}/lib/${PETSC_ARCH}
+PETSC_LIB_DIR_COMPLEX = ${PETSC_LIB_DIR}
 PETSC_SYS_LIB_BASIC_COMPLEX      = -lpetsc 
 PETSC_VEC_LIB_BASIC_COMPLEX      = -lpetscvec ${PETSC_SYS_LIB_BASIC_COMPLEX}
 PETSC_MAT_LIB_BASIC_COMPLEX      = -lpetscmat ${PETSC_VEC_LIB_BASIC_COMPLEX}
--- petsc-2.3.3-p2/bmake/common/rules.orig	2007-06-08 13:33:37.000000000 -0300
+++ petsc-2.3.3-p2/bmake/common/rules	2007-06-19 18:19:08.000000000 -0300
@@ -6,12 +6,14 @@
 	@mypwd=`pwd`; cd ${PETSC_DIR} 2>&1 > /dev/null; true_PETSC_DIR=`pwd`; cd $${mypwd} 2>&1 >/dev/null; \
         newpwd=`echo $${mypwd} | sed "s+$${true_PETSC_DIR}+DUMMY+g"`;\
         haspetsc=`echo $${mypwd} | sed "s+petsc-+DUMMY+g"`;\
+	if [ "${PETSCCHKDIRNOWARN}" == "" ]; then \
         if [ $${mypwd} = $${newpwd} -a $${haspetsc} != $${mypwd} ]; then \
           echo "*********************Warning*************************" ; \
           echo "Your PETSC_DIR may not match the directory you are in";\
           echo "PETSC_DIR " $${true_PETSC_DIR} "Current directory" $${mypwd};\
           echo "******************************************************" ; \
-        fi
+        fi; \
+	fi
 
 chk_loc:
 	@if [ ${LOC}foo = foo ] ; then \
--- petsc-2.3.3-p2/bmake/common/base.orig	2007-05-23 20:30:01.000000000 -0300
+++ petsc-2.3.3-p2/bmake/common/base	2007-06-20 12:27:50.000000000 -0300
@@ -7,4 +7,5 @@
 
 include ${PETSC_DIR}/bmake/common/variables
 include ${PETSC_DIR}/bmake/common/rules
+include ${PETSC_DIR}/bmake/common/siteconf