--- configure.orig	2017-01-17 01:27:18.000000000 -0700
+++ configure	2018-06-18 04:42:26.000000000 -0700
@@ -16507,7 +16507,7 @@
 
 
 if test "x$ac_cv_sizeof_void_p" = "x8" ; then
-   _lib=lib64
+   _lib=lib
 else
    _lib=lib
 fi
@@ -18086,7 +18086,7 @@
 for ((i=0; i < ${#D[@]} ; i++)); do
 COLPACK_LIBDIR="${D[$i]}"
 if test -n "$COLPACK_LIBDIR" ; then
-COLPACK_LIBS="-L$COLPACK_LIBDIR -lColPack -Wl,-rpath,$COLPACK_LIBDIR"
+COLPACK_LIBS="-L$COLPACK_LIBDIR -lColPack"
 fi
 if test x$have_colpackheaders = xyes ; then
    LIBS="$COLPACK_LIBS $LIBS"
@@ -18391,10 +18391,10 @@
     as_fn_error $? "if --with-ampi is set one  must also --enable-ampi" "$LINENO" 5
   fi
   CPPFLAGS="$CPPFLAGS -I$with_ampi/include"
-  LDFLAGS="$LDFLAGS -L$with_ampi/lib -Wl,-rpath,$with_ampi/lib"
+  LDFLAGS="$LDFLAGS -L$with_ampi/lib"
   if test x"$_lib" != "xlib" ;
   then
-     LDFLAGS="$LDFLAGS -L$with_ampi/${_lib} -Wl,-rpath,$with_ampi/${_lib}"
+     LDFLAGS="$LDFLAGS -L$with_ampi/${_lib}"
   fi
 fi