Further fixes to docbuilding of cvxopt

Author: jdemeyer

build/pkgs/cvxopt/dependencies

@@ -1,7 +1,7 @@
-$(PYTHON) numpy $(BLAS) cephes gsl glpk sphinx| pkgconfig pip matplotlib typing
+$(PYTHON) numpy $(BLAS) cephes gsl glpk | sphinx pkgconfig pip matplotlib
 
 matplotlib is needed to test cvxopt (i.e., if SAGE_CHECK=yes). See #12742.
-sphinx and typing are used to build docs (see #14645).
+sphinx is used to build docs (see #14645).
 ----------
 All lines of this file are ignored except the first.
 It is copied by SAGE_ROOT/build/make/install into SAGE_ROOT/build/make/Makefile.

build/pkgs/cvxopt/spkg-install

@@ -28,24 +28,12 @@ fi
 
 sdh_pip_install .
 
-if [ $? -ne 0 ]; then
-    echo "Error building/installing cvxopt"
-    exit 1
-fi
-
 # install docs
-if [ "x$SAGE_SPKG_INSTALL_DOCS" = xyes ] ; then
-   cd doc
-   ${MAKE} -B html
-   if [ $? -ne 0 ]; then
-      echo "Error building the documentation"
-      exit 1
-   fi
-# checking to see if there is previously installed documentation.
-   if [ -d $SAGE_LOCAL/share/doc/cvxopt/html ] ; then
-      rm -rf $SAGE_LOCAL/share/doc/cvxopt/html
-   fi
-   mkdir -p $SAGE_LOCAL/share/doc/cvxopt/html
-   cp -r build/html/* $SAGE_LOCAL/share/doc/cvxopt/html/
-fi
+if [ "$SAGE_SPKG_INSTALL_DOCS" = yes ]; then
+    cd doc
+    $MAKE -B html || sdh_die "Error building the documentation"
 
+    docdir="$SAGE_LOCAL/share/doc/cvxopt"
+    rm -rf "$docdir"
+    mv build/html "$docdir"
+fi