--- makefile.orig Sat Sep 2 03:57:37 2006 +++ makefile Sat Sep 2 23:20:34 2006 @@ -6,6 +6,7 @@ ALL: all LOCDIR = ./ DIRS = src include +DOCS_DIR = ${INSTALL_DIR}/../share/doc/petsc CFLAGS = FFLAGS = @@ -21,7 +22,7 @@ echo " Do not run configure as root, or using sudo.";\ echo " That should be reserved for installation";\ echo "********************************************************************"; \ - exit 1; fi + fi @${OMAKE} PETSC_ARCH=${PETSC_ARCH} chkpetsc_dir -@${OMAKE} all_build 2>&1 | tee make_log_${PETSC_ARCH} -@egrep -i "( error | error:)" make_log_${PETSC_ARCH} > /dev/null; if [ "$$?" = "0" ]; then \ @@ -261,14 +262,14 @@ -@if [ "${INSTALL_DIR}" = "${PETSC_DIR}" ]; then \ echo "You did not set a directory to install to";\ else \ - echo Installing PETSc documentation at ${INSTALL_DIR};\ - if [ ! -d `dirname ${INSTALL_DIR}` ]; then \ - ${MKDIR} `dirname ${INSTALL_DIR}` ; \ + echo Installing PETSc documentation at ${DOCS_DIR};\ + if [ ! -d `dirname ${DOCS_DIR}` ]; then \ + ${MKDIR} `dirname ${DOCS_DIR}` ; \ fi;\ - if [ ! -d ${INSTALL_DIR} ]; then \ - ${MKDIR} ${INSTALL_DIR} ; \ + if [ ! -d ${DOCS_DIR} ]; then \ + ${MKDIR} ${DOCS_DIR} ; \ fi;\ - cp -fr docs ${INSTALL_DIR};\ + cp -fr docs/* ${DOCS_DIR};\ ${RM} -fr docs/tex;\ fi; # ------------------------------------------------------------------