Changed the 'install' target so that it doesn't complain when the build and

install directories are the same.
This commit is contained in:
falgout 2011-01-03 20:00:19 +00:00
parent ee4524b1db
commit f28a7c956a

View File

@ -156,13 +156,24 @@ check:
(cd test; ls -l ij.err struct.err sstruct.err)
install: all
@echo "Installing hypre ..."
@echo "lib-install: ${HYPRE_LIB_INSTALL}"
${HYPRE_SRC_TOP_DIR}/config/mkinstalldirs ${HYPRE_LIB_INSTALL} ${HYPRE_INC_INSTALL}
cp -fpPR ${HYPRE_BUILD_DIR}/lib/* ${HYPRE_LIB_INSTALL}/.
cp -fpPR ${HYPRE_BUILD_DIR}/include/* ${HYPRE_INC_INSTALL}/.
chmod -R a+rX,u+w,go-w ${HYPRE_LIB_INSTALL}
chmod -R a+rX,u+w,go-w ${HYPRE_INC_INSTALL}
@ \
echo "Installing hypre ..."; \
${HYPRE_SRC_TOP_DIR}/config/mkinstalldirs ${HYPRE_LIB_INSTALL} ${HYPRE_INC_INSTALL}; \
cd ${HYPRE_BUILD_DIR}/lib; HYPRE_FROMDIR=`pwd`; \
cd ${HYPRE_LIB_INSTALL}; HYPRE_TODIR=`pwd`; \
if [ "$$HYPRE_FROMDIR" != "$$HYPRE_TODIR" ]; \
then \
cp -fpPR $$HYPRE_FROMDIR/* $$HYPRE_TODIR; \
fi; \
cd ${HYPRE_BUILD_DIR}/include; HYPRE_FROMDIR=`pwd`; \
cd ${HYPRE_INC_INSTALL}; HYPRE_TODIR=`pwd`; \
if [ "$$HYPRE_FROMDIR" != "$$HYPRE_TODIR" ]; \
then \
cp -fpPR $$HYPRE_FROMDIR/* $$HYPRE_TODIR; \
fi; \
chmod -R a+rX,u+w,go-w ${HYPRE_LIB_INSTALL}; \
chmod -R a+rX,u+w,go-w ${HYPRE_INC_INSTALL}; \
echo
clean:
@ \