tags 763909 patch
thanks
So 'getmachine' is looking in the non-multiarch directories for
libtiff, libpng, etc.
The attached patch works for me locally, but probably needs some more work.
If nobody takes this, I'll prepare an NMU at the end of this week.
--- a/source/getmachine
+++ b/source/getmachine
@@ -117,9 +117,9 @@
hint=1
# TIFF library
- if [ -f /usr/lib/libtiff.a ]
+ if [ -f /usr/lib/$DEB_HOST_MULTIARCH/libtiff.a ]
then
- libtiff="-L/usr/lib"
+ libtiff="-L/usr/lib/$DEB_HOST_MULTIARCH"
elif [ -f /usr/local/lib/libtiff.a ]
then
libtiff="-L/usr/local/lib"
@@ -135,12 +135,12 @@
echo "LIBTIFF = ${libtiff}" > .config.$os
# TIFF include file
- if [ -f /usr/include/tiff.h ]
+ if [ -f /usr/include/$DEB_HOST_MULTIARCH/tiff.h ]
then
case $os in
CYGWIN*) tiffinclude="."
;;
- *) tiffinclude="/usr/include"
+ *) tiffinclude="/usr/include/$DEB_HOST_MULTIARCH"
;;
esac
elif [ -f /usr/local/include/tiff.h ]
@@ -154,9 +154,9 @@
echo "TIFFINCLUDE = $tiffinclude" >> .config.$os
# PNG library
- if [ -f /usr/lib/libpng.a -o -f /usr/lib/libpng12.a ]
+ if [ -f /usr/lib/$DEB_HOST_MULTIARCH/libpng.a -o -f /usr/lib/$DEB_HOST_MULTIARCH/libpng12.a ]
then
- libpng="-L/usr/lib"
+ libpng="-L/usr/lib/$DEB_HOST_MULTIARCH"
elif [ -f /usr/local/lib/libpng.a ]
then
libpng="-L/usr/local/lib"
