From d8919cc342ccff35109c2696ba6c87220ccd83bc Mon Sep 17 00:00:00 2001
From: Matthias Koeppe <mkoeppe@math.ucdavis.edu>
Date: Sun, 18 Sep 2016 17:39:27 -0700
Subject: [PATCH] Add SAGE_SUDO for packages A-L

---
 build/pkgs/4ti2/spkg-install            |  2 +-
 build/pkgs/arb/spkg-install             |  2 +-
 build/pkgs/bliss/spkg-install           |  2 +-
 build/pkgs/brial/spkg-install           |  2 +-
 build/pkgs/bzip2/spkg-install           |  2 +-
 build/pkgs/cbc/spkg-install             |  4 ++--
 build/pkgs/ccache/spkg-do-install       | 16 ++++++++++++++
 build/pkgs/ccache/spkg-install          | 17 +--------------
 build/pkgs/cddlib/spkg-install          |  2 +-
 build/pkgs/cephes/spkg-install          |  2 +-
 build/pkgs/cliquer/spkg-install         |  2 +-
 build/pkgs/cmake/spkg-install           |  2 +-
 build/pkgs/compilerwrapper/spkg-install |  2 +-
 build/pkgs/coxeter3/spkg-install        |  2 +-
 build/pkgs/cryptominisat/spkg-install   |  2 +-
 build/pkgs/csdp/spkg-install            |  2 +-
 build/pkgs/cysignals/spkg-install       |  2 +-
 build/pkgs/ecl/spkg-do-install          | 28 ++++++++++++++++++++++++
 build/pkgs/ecl/spkg-install             | 29 +------------------------
 build/pkgs/eclib/spkg-install           |  2 +-
 build/pkgs/ecm/spkg-install             |  2 +-
 build/pkgs/fflas_ffpack/spkg-install    |  2 +-
 build/pkgs/flint/spkg-install           |  2 +-
 build/pkgs/flintqs/spkg-install         |  2 +-
 build/pkgs/gc/spkg-install              |  2 +-
 build/pkgs/gcc/spkg-install             |  4 ++--
 build/pkgs/gf2x/spkg-do-install         | 12 ++++++++++
 build/pkgs/gf2x/spkg-install            | 11 +---------
 build/pkgs/giac/spkg-install            |  2 +-
 build/pkgs/givaro/spkg-install          |  2 +-
 build/pkgs/glpk/spkg-install            |  2 +-
 build/pkgs/gmp/spkg-install             |  2 +-
 build/pkgs/gp2c/spkg-install            |  2 +-
 build/pkgs/gsl/spkg-install             |  2 +-
 build/pkgs/iconv/spkg-install           |  2 +-
 build/pkgs/iml/spkg-install             |  2 +-
 build/pkgs/latte_int/spkg-install       | 14 ++++++++++--
 37 files changed, 103 insertions(+), 88 deletions(-)
 create mode 100644 build/pkgs/ccache/spkg-do-install
 create mode 100644 build/pkgs/ecl/spkg-do-install
 create mode 100644 build/pkgs/gf2x/spkg-do-install

diff --git a/build/pkgs/4ti2/spkg-install b/build/pkgs/4ti2/spkg-install
index 10d9256fec2..cb21a7e7ea1 100755
--- a/build/pkgs/4ti2/spkg-install
+++ b/build/pkgs/4ti2/spkg-install
@@ -13,7 +13,7 @@ export CFLAGS
 ./configure --prefix=$SAGE_LOCAL --with-gmp=$SAGE_LOCAL --with-glpk=$SAGE_LOCAL --enable-shared=yes --enable-static=no
 
 $MAKE
-$MAKE install
+$SAGE_SUDO $MAKE install
 
 if [ $? -ne 0 ]; then
    echo "Error building 4ti2"
diff --git a/build/pkgs/arb/spkg-install b/build/pkgs/arb/spkg-install
index 5e8e9e7dbd6..af15766a9bb 100755
--- a/build/pkgs/arb/spkg-install
+++ b/build/pkgs/arb/spkg-install
@@ -28,7 +28,7 @@ if [ $? -ne 0 ]; then
     exit 1
 fi
 
-$MAKE install
+$SAGE_SUDO $MAKE install
 if [ $? -ne 0 ]; then
     echo >&2 "Error installing arb."
     exit 1
diff --git a/build/pkgs/bliss/spkg-install b/build/pkgs/bliss/spkg-install
index daf5381e506..fbeeb5ac4fa 100755
--- a/build/pkgs/bliss/spkg-install
+++ b/build/pkgs/bliss/spkg-install
@@ -17,7 +17,7 @@ for patch in ../patches/*.patch; do
     fi
 done
 
-./configure --prefix="$SAGE_LOCAL" --disable-gmp && $MAKE && $MAKE install
+./configure --prefix="$SAGE_LOCAL" --disable-gmp && $MAKE && $SAGE_SUDO $MAKE install
 
 if [ $? -ne 0 ]; then
     echo "An error occurred whilst building bliss"
diff --git a/build/pkgs/brial/spkg-install b/build/pkgs/brial/spkg-install
index 6bd8142bac1..b7438c4bee6 100755
--- a/build/pkgs/brial/spkg-install
+++ b/build/pkgs/brial/spkg-install
@@ -40,7 +40,7 @@ if [ $? -ne 0 ]; then
     exit 1
 fi
 
-$MAKE install -j1
+$SAGE_SUDO $MAKE install -j1
 if [ $? -ne 0 ]; then
     echo "Error installing BRiAl"
     exit 1
diff --git a/build/pkgs/bzip2/spkg-install b/build/pkgs/bzip2/spkg-install
index aa267c107ee..812550163e2 100755
--- a/build/pkgs/bzip2/spkg-install
+++ b/build/pkgs/bzip2/spkg-install
@@ -44,7 +44,7 @@ if [ $? -ne 0 ]; then
     exit 1
 fi
 
-$MAKE install
+$SAGE_SUDO $MAKE install
 if [ $? -ne 0 ]; then
     echo >&2 "Error installing bzip2"
     exit 1
diff --git a/build/pkgs/cbc/spkg-install b/build/pkgs/cbc/spkg-install
index 986af98a656..ac2c265ce4f 100755
--- a/build/pkgs/cbc/spkg-install
+++ b/build/pkgs/cbc/spkg-install
@@ -20,5 +20,5 @@ export LDFLAGS="$LDFLAGS -lz -lbz2"
 cd src &&
 sed -i -e "s/clock\_gettime ()/Grrrrrrrrrrrr\ ()/g" Cbc/configure &&
 ./configure --prefix="$SAGE_LOCAL" "${args[@]}" --enable-cbc-parallel --enable-parallel --enable-gnu-packages --enable-static &&
-make &&
-make install
+$MAKE &&
+$SAGE_SUDO $MAKE install
diff --git a/build/pkgs/ccache/spkg-do-install b/build/pkgs/ccache/spkg-do-install
new file mode 100644
index 00000000000..44abdb8eaa4
--- /dev/null
+++ b/build/pkgs/ccache/spkg-do-install
@@ -0,0 +1,16 @@
+$MAKE install || die "installing ccache failed"
+
+
+set -e
+
+mkdir -p "$SAGE_LOCAL/libexec/ccache"
+ln -sf ../../bin/ccache "$SAGE_LOCAL/libexec/ccache/cc"
+ln -sf ../../bin/ccache "$SAGE_LOCAL/libexec/ccache/c++"
+ln -sf ../../bin/ccache "$SAGE_LOCAL/libexec/ccache/gcc"
+ln -sf ../../bin/ccache "$SAGE_LOCAL/libexec/ccache/g++"
+ln -sf ../../bin/ccache "$SAGE_LOCAL/libexec/ccache/clang"
+ln -sf ../../bin/ccache "$SAGE_LOCAL/libexec/ccache/clang++"
+
+# Copy a reasonable default configuration for Sage
+# (cache size of 4G and compression enabled)
+cp -p ../ccache.conf "$SAGE_LOCAL/etc"
diff --git a/build/pkgs/ccache/spkg-install b/build/pkgs/ccache/spkg-install
index 60003e52e7c..658cd30e04d 100755
--- a/build/pkgs/ccache/spkg-install
+++ b/build/pkgs/ccache/spkg-install
@@ -15,19 +15,4 @@ export CPPFLAGS="-I$SAGE_LOCAL/include $CPPFLAGS"
 
 $MAKE || die "building ccache failed"
 
-$MAKE install || die "installing ccache failed"
-
-
-set -e
-
-mkdir -p "$SAGE_LOCAL/libexec/ccache"
-ln -sf ../../bin/ccache "$SAGE_LOCAL/libexec/ccache/cc"
-ln -sf ../../bin/ccache "$SAGE_LOCAL/libexec/ccache/c++"
-ln -sf ../../bin/ccache "$SAGE_LOCAL/libexec/ccache/gcc"
-ln -sf ../../bin/ccache "$SAGE_LOCAL/libexec/ccache/g++"
-ln -sf ../../bin/ccache "$SAGE_LOCAL/libexec/ccache/clang"
-ln -sf ../../bin/ccache "$SAGE_LOCAL/libexec/ccache/clang++"
-
-# Copy a reasonable default configuration for Sage
-# (cache size of 4G and compression enabled)
-cp -p ../ccache.conf "$SAGE_LOCAL/etc"
+$SAGE_SUDO ../spkg-do-install
diff --git a/build/pkgs/cddlib/spkg-install b/build/pkgs/cddlib/spkg-install
index d70d31b0c07..63821120bd3 100755
--- a/build/pkgs/cddlib/spkg-install
+++ b/build/pkgs/cddlib/spkg-install
@@ -53,5 +53,5 @@ cp "$SAGE_ROOT"/config/config.* .
 $MAKE ||
   die "Error building cddlib"
 
-$MAKE install ||
+$SAGE_SUDO $MAKE install ||
   die "Error installing cddlib"
diff --git a/build/pkgs/cephes/spkg-install b/build/pkgs/cephes/spkg-install
index cea99aed88c..2e3630a45c8 100755
--- a/build/pkgs/cephes/spkg-install
+++ b/build/pkgs/cephes/spkg-install
@@ -32,7 +32,7 @@ if [ $? -ne 0 ]; then
 fi
 
 echo "Installing Cephes..."
-$MAKE install
+$SAGE_SUDO $MAKE install
 if [ $? -ne 0 ]; then
    echo >&2 "Error - Failed to build Cephes ... exiting"
    exit 1
diff --git a/build/pkgs/cliquer/spkg-install b/build/pkgs/cliquer/spkg-install
index 10b9cabca11..f80de033394 100755
--- a/build/pkgs/cliquer/spkg-install
+++ b/build/pkgs/cliquer/spkg-install
@@ -28,7 +28,7 @@ if [ $? -ne 0 ]; then
 fi
 
 echo "Building and installing ..."
-$MAKE install
+$SAGE_SUDO $MAKE install
 if [ $? -ne 0 ]; then
     echo >&2 "Error installing cliquer"
     exit 1
diff --git a/build/pkgs/cmake/spkg-install b/build/pkgs/cmake/spkg-install
index 786c15225c9..411ead2ffdb 100755
--- a/build/pkgs/cmake/spkg-install
+++ b/build/pkgs/cmake/spkg-install
@@ -31,7 +31,7 @@ if [ $? -ne 0 ]; then
     exit 1
 fi
 
-$MAKE install
+$SAGE_SUDO $MAKE install
 if [ $? -ne 0 ]; then
     echo >&2 "Error installing CMake."
     exit 1
diff --git a/build/pkgs/compilerwrapper/spkg-install b/build/pkgs/compilerwrapper/spkg-install
index 0a4fea0ee01..eb1a5308851 100755
--- a/build/pkgs/compilerwrapper/spkg-install
+++ b/build/pkgs/compilerwrapper/spkg-install
@@ -43,7 +43,7 @@ if [ $? -ne 0 ]; then
   exit 1
 fi
 
-$MAKE install
+$SAGE_SUDO $MAKE install
 if [ $? -ne 0 ]; then
   echo >&2 "Error installing the gcc wrapper."
   exit 1
diff --git a/build/pkgs/coxeter3/spkg-install b/build/pkgs/coxeter3/spkg-install
index f1c64f35e3c..dbb2eb6c544 100755
--- a/build/pkgs/coxeter3/spkg-install
+++ b/build/pkgs/coxeter3/spkg-install
@@ -33,7 +33,7 @@ if [ $? -ne 0 ]; then
 fi
 
 # Install
-$MAKE install
+$SAGE_SUDO $MAKE install
 if [ $? -ne 0 ]; then
    echo >&2 "Error installing coxeter3"
    exit 1
diff --git a/build/pkgs/cryptominisat/spkg-install b/build/pkgs/cryptominisat/spkg-install
index 35a1d0dda59..edf686de266 100755
--- a/build/pkgs/cryptominisat/spkg-install
+++ b/build/pkgs/cryptominisat/spkg-install
@@ -65,7 +65,7 @@ if [ $? -ne 0 ]; then
     exit 1
 fi
 
-$MAKE install
+$SAGE_SUDO $MAKE install
 
 if [ $? -ne 0 ]; then
     echo "Error installing cryptominisat"
diff --git a/build/pkgs/csdp/spkg-install b/build/pkgs/csdp/spkg-install
index db06a53f610..8dd6104762d 100755
--- a/build/pkgs/csdp/spkg-install
+++ b/build/pkgs/csdp/spkg-install
@@ -29,7 +29,7 @@ if [ $? -ne 0 ]; then
 fi
 
 echo "Installing csdp..."
-$MAKE install
+$SAGE_SUDO $MAKE install
 if [ $? -ne 0 ]; then
     echo >&2 "Error installing csdp."
     exit 1
diff --git a/build/pkgs/cysignals/spkg-install b/build/pkgs/cysignals/spkg-install
index 4ff23b36648..b2cbfc7f0d7 100755
--- a/build/pkgs/cysignals/spkg-install
+++ b/build/pkgs/cysignals/spkg-install
@@ -23,7 +23,7 @@ if [ $? -ne 0 ]; then
     exit 1
 fi
 
-$MAKE install
+$SAGE_SUDO $MAKE install
 if [ $? -ne 0 ]; then
     echo "Error installing cysignals ... exiting"
     exit 1
diff --git a/build/pkgs/ecl/spkg-do-install b/build/pkgs/ecl/spkg-do-install
new file mode 100644
index 00000000000..3d494d84177
--- /dev/null
+++ b/build/pkgs/ecl/spkg-do-install
@@ -0,0 +1,28 @@
+# Remove old install of ECL, if any.
+rm -rf "$SAGE_LOCAL/lib/ecl-"*
+if [ $? -ne 0 ]; then
+    echo >&2 "Error - Failed to remove old ECL install ... exiting"
+    exit 1
+fi
+
+$MAKE install
+if [ $? -ne 0 ]; then
+    echo >&2 "Error - Failed to install ECL ... exiting"
+    exit 1
+fi
+
+# Create symbolic link to lib/ecl-version directory.
+# Also create a symbolic link lib/ecl/ecl -> include/ecl.
+# This is important when the Sage install is moved, see Trac #14662.
+cd "$SAGE_LOCAL/lib/" && rm -f ecl && ln -s ecl-* ecl
+if [ $? -ne 0 ]; then
+    echo >&2 "Error - Failed to create symbolic link to ECL library"
+    echo >&2 "directory ... exiting"
+    exit 1
+fi
+cd "$SAGE_LOCAL/lib/ecl" && rm -f ecl && ln -s ../../include/ecl ecl
+if [ $? -ne 0 ]; then
+    echo >&2 "Error - Failed to create symbolic link to ECL include"
+    echo >&2 "directory ... exiting"
+    exit 1
+fi
diff --git a/build/pkgs/ecl/spkg-install b/build/pkgs/ecl/spkg-install
index 202f03e7401..9fa7a30260d 100755
--- a/build/pkgs/ecl/spkg-install
+++ b/build/pkgs/ecl/spkg-install
@@ -97,31 +97,4 @@ if [ $? -ne 0 ]; then
     exit 1
 fi
 
-# Remove old install of ECL, if any.
-rm -rf "$SAGE_LOCAL/lib/ecl-"*
-if [ $? -ne 0 ]; then
-    echo >&2 "Error - Failed to remove old ECL install ... exiting"
-    exit 1
-fi
-
-$MAKE install
-if [ $? -ne 0 ]; then
-    echo >&2 "Error - Failed to install ECL ... exiting"
-    exit 1
-fi
-
-# Create symbolic link to lib/ecl-version directory.
-# Also create a symbolic link lib/ecl/ecl -> include/ecl.
-# This is important when the Sage install is moved, see Trac #14662.
-cd "$SAGE_LOCAL/lib/" && rm -f ecl && ln -s ecl-* ecl
-if [ $? -ne 0 ]; then
-    echo >&2 "Error - Failed to create symbolic link to ECL library"
-    echo >&2 "directory ... exiting"
-    exit 1
-fi
-cd "$SAGE_LOCAL/lib/ecl" && rm -f ecl && ln -s ../../include/ecl ecl
-if [ $? -ne 0 ]; then
-    echo >&2 "Error - Failed to create symbolic link to ECL include"
-    echo >&2 "directory ... exiting"
-    exit 1
-fi
+$SAGE_SUDO ../spkg-do-install
diff --git a/build/pkgs/eclib/spkg-install b/build/pkgs/eclib/spkg-install
index f0c29fe081c..3147f23d2b4 100755
--- a/build/pkgs/eclib/spkg-install
+++ b/build/pkgs/eclib/spkg-install
@@ -81,7 +81,7 @@ fi
 
 echo
 echo "Build succeeded.  Now installing eclib..."
-$MAKE install
+$SAGE_SUDO $MAKE install
 if [ $? -ne 0 ]; then
     echo >&2 "Error installing eclib."
     exit 1
diff --git a/build/pkgs/ecm/spkg-install b/build/pkgs/ecm/spkg-install
index fc49b3d5754..a59c3a16c20 100755
--- a/build/pkgs/ecm/spkg-install
+++ b/build/pkgs/ecm/spkg-install
@@ -285,7 +285,7 @@ rm -f "$SAGE_LOCAL"/share/man/man1/ecm.1
 ###############################################################################
 
 echo "Now installing GMP-ECM..."
-$MAKE install
+$SAGE_SUDO $MAKE install
 if [ $? -ne 0 ]; then
     echo >&2 "Error installing GMP-ECM (though it appears to have built fine)."
     exit 1
diff --git a/build/pkgs/fflas_ffpack/spkg-install b/build/pkgs/fflas_ffpack/spkg-install
index bd854b5d539..d07ecddbc5e 100755
--- a/build/pkgs/fflas_ffpack/spkg-install
+++ b/build/pkgs/fflas_ffpack/spkg-install
@@ -100,7 +100,7 @@ if [ $? -ne 0 ]; then
     exit 1
 fi
 
-$MAKE install
+$SAGE_SUDO $MAKE install
 if [ $? -ne 0 ]; then
     echo >&2 "Error installing fflas-ffpack"
     exit 1
diff --git a/build/pkgs/flint/spkg-install b/build/pkgs/flint/spkg-install
index cdb18a54237..4577c4f3f63 100755
--- a/build/pkgs/flint/spkg-install
+++ b/build/pkgs/flint/spkg-install
@@ -61,7 +61,7 @@ rm -f $SAGE_LOCAL/lib/libflint*
 rm -rf $SAGE_LOCAL/include/flint
 
 echo "Installing new FLINT files."
-$MAKE install
+$SAGE_SUDO $MAKE install
 if [ $? -ne 0 ]; then
     echo >&2 "Error: Failed to install FLINT."
     exit 1
diff --git a/build/pkgs/flintqs/spkg-install b/build/pkgs/flintqs/spkg-install
index e4127606438..3bc1ccff41b 100755
--- a/build/pkgs/flintqs/spkg-install
+++ b/build/pkgs/flintqs/spkg-install
@@ -24,7 +24,7 @@ if [ $? -ne 0 ]; then
     exit 1
 fi
 
-$MAKE install
+$SAGE_SUDO $MAKE install
 if [ $? -ne 0 ]; then
     echo "Error copying QuadraticSieve file"
     exit 1
diff --git a/build/pkgs/gc/spkg-install b/build/pkgs/gc/spkg-install
index 0498faa4dc9..10a960add29 100755
--- a/build/pkgs/gc/spkg-install
+++ b/build/pkgs/gc/spkg-install
@@ -44,7 +44,7 @@ if [ $? -ne 0 ]; then
    exit 1
 fi
 
-$MAKE install
+$SAGE_SUDO $MAKE install
 
 if [ $? -ne 0 ]; then
    echo >&2 "Error installing BoehmGC."
diff --git a/build/pkgs/gcc/spkg-install b/build/pkgs/gcc/spkg-install
index 885b5e49ab9..2ce230df57b 100755
--- a/build/pkgs/gcc/spkg-install
+++ b/build/pkgs/gcc/spkg-install
@@ -131,12 +131,12 @@ fi
 
 $MAKE BOOT_LDFLAGS="-Wl,-rpath,$SAGE_LOCAL/lib"
 
-$MAKE install
+$SAGE_SUDO $MAKE install
 
 
 # Force re-installation of gmp, mpir, mpfr and mpc with the GCC we just built.
 cd "$SAGE_SPKG_INST"
-rm -f gmp-* mpir-* mpfr-* mpc-*
+$SAGE_SUDO rm -f gmp-* mpir-* mpfr-* mpc-*
 
 # Force re-configuration: the next time that "make" is run, we don't
 # want GCC to be built again, see Trac #19324
diff --git a/build/pkgs/gf2x/spkg-do-install b/build/pkgs/gf2x/spkg-do-install
new file mode 100644
index 00000000000..a3901036220
--- /dev/null
+++ b/build/pkgs/gf2x/spkg-do-install
@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+
+echo "Deleting old gf2x files."
+rm -f "$SAGE_LOCAL"/lib/libgf2x*
+rm -rf "$SAGE_LOCAL"/include/gf2x*
+
+echo "Installing gf2x."
+$MAKE install
+if [ $? -ne 0 ]; then
+    echo >&2 "Error: Failed to install gf2x."
+    exit 1
+fi
diff --git a/build/pkgs/gf2x/spkg-install b/build/pkgs/gf2x/spkg-install
index 3178dc6cbc8..e832e6e0cff 100755
--- a/build/pkgs/gf2x/spkg-install
+++ b/build/pkgs/gf2x/spkg-install
@@ -86,13 +86,4 @@ case "$SAGE_TUNE_GF2X" in
         ;;
 esac
 
-echo "Deleting old gf2x files."
-rm -f "$SAGE_LOCAL"/lib/libgf2x*
-rm -rf "$SAGE_LOCAL"/include/gf2x*
-
-echo "Installing gf2x."
-$MAKE install
-if [ $? -ne 0 ]; then
-    echo >&2 "Error: Failed to install gf2x."
-    exit 1
-fi
+$SAGE_SUDO ../spkg-do-install
diff --git a/build/pkgs/giac/spkg-install b/build/pkgs/giac/spkg-install
index da100879b47..dd5aea7a910 100755
--- a/build/pkgs/giac/spkg-install
+++ b/build/pkgs/giac/spkg-install
@@ -73,7 +73,7 @@ if [ $? -ne 0 ]; then
 fi
 
 echo "Installing giac..."
-$MAKE install
+$SAGE_SUDO $MAKE install
 if [ $? -ne 0 ]; then
     echo >&2 "Error installing Giac."
     exit 1
diff --git a/build/pkgs/givaro/spkg-install b/build/pkgs/givaro/spkg-install
index fd565ed05d3..98e15bf9003 100755
--- a/build/pkgs/givaro/spkg-install
+++ b/build/pkgs/givaro/spkg-install
@@ -50,7 +50,7 @@ if [ $? -ne 0 ]; then
     exit 1
 fi
 
-$MAKE install
+$SAGE_SUDO $MAKE install
 if [ $? -ne 0 ]; then
     echo >&2 "Error installing givaro"
     exit 1
diff --git a/build/pkgs/glpk/spkg-install b/build/pkgs/glpk/spkg-install
index 485089cf11b..31aa471513c 100755
--- a/build/pkgs/glpk/spkg-install
+++ b/build/pkgs/glpk/spkg-install
@@ -74,7 +74,7 @@ if [ $? -ne 0 ]; then
     exit 1
 fi
 
-$MAKE install
+$SAGE_SUDO $MAKE install
 if [ $? -ne 0 ]; then
     echo >&2 "Error installing GLPK."
     exit 1
diff --git a/build/pkgs/gmp/spkg-install b/build/pkgs/gmp/spkg-install
index d9dff44b169..9e9f705eea5 100755
--- a/build/pkgs/gmp/spkg-install
+++ b/build/pkgs/gmp/spkg-install
@@ -328,7 +328,7 @@ rm -f "$SAGE_SPKG_INST"/mpir-*
 ###############################################################################
 
 echo "Now installing GMP..."
-$MAKE install
+$SAGE_SUDO $MAKE install
 if [ $? -ne 0 ]; then
     echo >&2 "Error installing GMP."
     exit 1
diff --git a/build/pkgs/gp2c/spkg-install b/build/pkgs/gp2c/spkg-install
index 0346d362ada..43051f0ca4b 100755
--- a/build/pkgs/gp2c/spkg-install
+++ b/build/pkgs/gp2c/spkg-install
@@ -21,4 +21,4 @@ set -e
 
 ./configure --prefix="$SAGE_LOCAL" --with-paricfg="$SAGE_LOCAL/lib/pari/pari.cfg"
 
-$MAKE install
+$SAGE_SUDO $MAKE install
diff --git a/build/pkgs/gsl/spkg-install b/build/pkgs/gsl/spkg-install
index 91ca80c064a..5dd0fa21b1b 100755
--- a/build/pkgs/gsl/spkg-install
+++ b/build/pkgs/gsl/spkg-install
@@ -59,7 +59,7 @@ if [ $? -ne 0 ]; then
 fi
 
 echo "Installing GSL..."
-$MAKE install
+$SAGE_SUDO $MAKE install
 if [ $? -ne 0 ]; then
     echo >&2 "Error installing GSL."
     exit 1
diff --git a/build/pkgs/iconv/spkg-install b/build/pkgs/iconv/spkg-install
index f6e7dc334a0..a81d268985e 100755
--- a/build/pkgs/iconv/spkg-install
+++ b/build/pkgs/iconv/spkg-install
@@ -56,7 +56,7 @@ CYGWIN|HP-UX|SunOS)
         exit 1
     fi
 
-    $MAKE install
+    $SAGE_SUDO $MAKE install
     if [ $? -ne 0 ]; then
         echo >&2 "Error installing iconv"
         exit 1
diff --git a/build/pkgs/iml/spkg-install b/build/pkgs/iml/spkg-install
index c246547f269..b638d4028b8 100755
--- a/build/pkgs/iml/spkg-install
+++ b/build/pkgs/iml/spkg-install
@@ -50,7 +50,7 @@ if [ $? -ne 0 ]; then
     exit 1
 fi
 
-$MAKE install
+$SAGE_SUDO $MAKE install
 if [ $? -ne 0 ]; then
     echo >&2 "Error installing IML."
     exit 1
diff --git a/build/pkgs/latte_int/spkg-install b/build/pkgs/latte_int/spkg-install
index 8c3239f25d5..411bf160dd5 100755
--- a/build/pkgs/latte_int/spkg-install
+++ b/build/pkgs/latte_int/spkg-install
@@ -15,11 +15,21 @@ cd src
 CXXFLAGS="-DNTL_STD_CXX $CXXFLAGS"
 export CXXFLAGS
 ./configure --prefix=$SAGE_LOCAL --enable-shared=yes --enable-static=false --with-gmp=$SAGE_LOCAL --with-ntl=$SAGE_LOCAL --with-cddlib=$SAGE_LOCAL --with-4ti2=$SAGE_LOCAL --with-lidia=$SAGE_LOCAL
-$MAKE
-$MAKE install
+if [ $? -ne 0 ]; then
+   echo "Error configuring latte-int"
+   exit 1
+fi
 
+$MAKE
 if [ $? -ne 0 ]; then
    echo "Error building latte-int"
    exit 1
 fi
 
+$SAGE_SUDO $MAKE install
+if [ $? -ne 0 ]; then
+   echo "Error installing latte-int"
+   exit 1
+fi
+
+