diff --git a/Make.inc.in b/Make.inc.in index 0cd83ca8..8affc4cd 100644 --- a/Make.inc.in +++ b/Make.inc.in @@ -13,6 +13,7 @@ INSTALL_DATA=@INSTALL_DATA@ INSTALL_DIR=@INSTALL_DIR@ INSTALL_LIBDIR=@INSTALL_LIBDIR@ INSTALL_INCLUDEDIR=@INSTALL_INCLUDEDIR@ +INSTALL_DOCSDIR=@INSTALL_DOCSDIR@ ########################################################## # # diff --git a/Makefile b/Makefile index 76d22c73..26e2b21e 100644 --- a/Makefile +++ b/Makefile @@ -17,6 +17,8 @@ install: $(INSTALL_DATA) lib/*.a $(INSTALL_LIBDIR)) (./mkdir.sh $(INSTALL_INCLUDEDIR) && \ $(INSTALL_DATA) lib/*$(.mod) $(INSTALL_INCLUDEDIR)) + (./mkdir.sh $(INSTALL_DOCSDIR) && \ + /bin/cp -fr docs/*pdf docs/html $(INSTALL_DOCSDIR)) veryclean: (cd mlprec; make veryclean) (cd krylov; make veryclean) diff --git a/configure b/configure index 460e526f..5b41481d 100755 --- a/configure +++ b/configure @@ -675,6 +675,7 @@ INSTALL INSTALL_DIR INSTALL_LIBDIR INSTALL_INCLUDEDIR +INSTALL_DOCSDIR SLU_FLAGS SLU_LIBS UMF_FLAGS @@ -1945,8 +1946,12 @@ case $includedir in \/* ) eval "INSTALL_INCLUDEDIR=$includedir";; * ) eval "INSTALL_INCLUDEDIR=$INSTALL_DIR/include";; esac -{ echo "$as_me:$LINENO: result: $INSTALL_DIR $INSTALL_INCLUDEDIR $INSTALL_LIBDIR" >&5 -echo "${ECHO_T}$INSTALL_DIR $INSTALL_INCLUDEDIR $INSTALL_LIBDIR" >&6; } +case $docsdir in + \/* ) eval "INSTALL_DOCSDIR=$docsdir";; + * ) eval "INSTALL_DOCSDIR=$INSTALL_DIR/docs";; +esac +{ echo "$as_me:$LINENO: result: $INSTALL_DIR $INSTALL_INCLUDEDIR $INSTALL_LIBDIR $INSTALL_DOCSDIR" >&5 +echo "${ECHO_T}$INSTALL_DIR $INSTALL_INCLUDEDIR $INSTALL_LIBDIR $INSTALL_DOCSDIR" >&6; } ############################################################################### # Compilers detection: FC,F77,CC should be set, if found. @@ -4838,6 +4843,7 @@ fi + ############################################################################### # the following files will be created by Automake @@ -5532,6 +5538,7 @@ INSTALL!$INSTALL$ac_delim INSTALL_DIR!$INSTALL_DIR$ac_delim INSTALL_LIBDIR!$INSTALL_LIBDIR$ac_delim INSTALL_INCLUDEDIR!$INSTALL_INCLUDEDIR$ac_delim +INSTALL_DOCSDIR!$INSTALL_DOCSDIR$ac_delim SLU_FLAGS!$SLU_FLAGS$ac_delim SLU_LIBS!$SLU_LIBS$ac_delim UMF_FLAGS!$UMF_FLAGS$ac_delim @@ -5543,7 +5550,7 @@ LIBOBJS!$LIBOBJS$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 69; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 70; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 diff --git a/configure.ac b/configure.ac index 4878df3a..adf5a8ac 100755 --- a/configure.ac +++ b/configure.ac @@ -106,7 +106,11 @@ case $includedir in \/* ) eval "INSTALL_INCLUDEDIR=$includedir";; * ) eval "INSTALL_INCLUDEDIR=$INSTALL_DIR/include";; esac -AC_MSG_RESULT([$INSTALL_DIR $INSTALL_INCLUDEDIR $INSTALL_LIBDIR]) +case $docsdir in + \/* ) eval "INSTALL_DOCSDIR=$docsdir";; + * ) eval "INSTALL_DOCSDIR=$INSTALL_DIR/docs";; +esac +AC_MSG_RESULT([$INSTALL_DIR $INSTALL_INCLUDEDIR $INSTALL_LIBDIR $INSTALL_DOCSDIR]) ############################################################################### # Compilers detection: FC,F77,CC should be set, if found. @@ -212,6 +216,7 @@ AC_SUBST(INSTALL_DATA) AC_SUBST(INSTALL_DIR) AC_SUBST(INSTALL_LIBDIR) AC_SUBST(INSTALL_INCLUDEDIR) +AC_SUBST(INSTALL_DOCSDIR) AC_SUBST(SLU_FLAGS) AC_SUBST(SLU_LIBS) diff --git a/docs/html/img102.png b/docs/html/img102.png new file mode 100644 index 00000000..9113ab47 Binary files /dev/null and b/docs/html/img102.png differ diff --git a/docs/html/node14.html b/docs/html/node14.html index a22815d7..a99bc3e8 100644 --- a/docs/html/node14.html +++ b/docs/html/node14.html @@ -136,7 +136,7 @@ for the coarsest-level solvers available in MLD2P4).
Remark 2. The include path for MLD2P4 must override
-those for PSBLAS, e.g. the latter must come first in the sequence
+those for PSBLAS, i.e. the former must come first in the sequence
passed to the compiler, as the MLD2P4 version of the Krylov solver
interfaces must override that of PSBLAS. This will change in the future
when the support for the class
statement becomes widespread in Fortran
diff --git a/docs/html/node26.html b/docs/html/node26.html
index af85d42c..964aa814 100644
--- a/docs/html/node26.html
+++ b/docs/html/node26.html
@@ -67,7 +67,7 @@ Mathematics Department, Macquarie University, Sydney.
The command line arguments were:
latex2html -noaddress -dir ../../html userhtml.tex
-The translation was initiated by Salvatore Filippone on 2008-07-24
+The translation was initiated by Salvatore Filippone on 2008-08-29