forward-port quilt patches

debian/patches/0001-libdir-okay.patch

@@ -6,43 +6,19 @@ Remove the code that fiddles with ${libdir} from configure.ac, thus
 allowing the autotools system in general, and the multiarch code in
 particular, to do the right thing, as is its want.
 ---
- configure.ac | 14 +++++++-------
- 1 file changed, 7 insertions(+), 7 deletions(-)
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/configure.ac b/configure.ac
-index 8946c0e..6bfad98 100644
+index fe716f8..27e04ac 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -60,7 +60,7 @@ if test "x$ac_cv_sizeof_void_p" = "x8" ; then
+@@ -77,7 +77,7 @@ if test "x$ac_cv_sizeof_void_p" = "x8" ; then
  else
     _lib=lib
  fi
 -if test "x$libdir_set_on_cmd" = "xno" ; then
 +if false && test "x$libdir_set_on_cmd" = "xno" ; then
-    libdir='${exec_prefix}/${_lib}'
+    libdir='${exec_prefix}'/"${_lib}"
     AC_SUBST(_lib)
     AC_SUBST(libdir)
-@@ -585,17 +585,17 @@ echo \
-      compiling:
-         * add \"-I${prefix}/include\" to your compiler call
-      linking:
--        * add \"-L${prefix}/${_lib} -ladolc\" to your linker call
--        * extend your linker call by \"-Wl,--rpath -Wl,${prefix}/${_lib}\"
-+        * add \"-L${libdir} -ladolc\" to your linker call
-+        * extend your linker call by \"-Wl,--rpath -Wl,${libdir}\"
-           (if you wish to skip the point \"executing\")
-      executing (do one of the following things):
--        * add ${prefix}/${_lib} to your LD_LIBRARY_PATH variable
--        * ask your system administrator for adding ${prefix}/${_lib} to
-+        * add ${libdir} to your LD_LIBRARY_PATH variable
-+        * ask your system administrator to add ${libdir} to
-           the global file containing library search paths (/etc/ld.so.conf)
-
-      (or use the static library by replacing
--        \"-L${prefix}/${_lib} -ladolc\" with
--        \"${prefix}/${_lib}/libadolc.a\" when linking)
-+        \"-L${libdir} -ladolc\" with
-+        \"${libdir}/libadolc.a\" when linking)
-
-   See README for instructions on how to change to a nonlocal installation!
-