A few tweaks to the build script for Ubuntu 11.10

git-svn-id: svn://localhost/ardour2/branches/3.0@12090 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/tools/linux_packaging/build b/tools/linux_packaging/build
index f2fa1293ecd3626ffd347c5efd347ccb08910252..75e32f7f60d377907889e8c9f036aa8b784a8746 100755 (executable)
--- a/tools/linux_packaging/build
+++ b/tools/linux_packaging/build
@@ -320,6 +320,8 @@ elif [ -d /usr/lib/pango ]; then
        PANGOROOT="/usr/lib"
 elif [ -d /usr/local/lib/pango ]; then
        PANGOROOT="/usr/local/lib"
+elif [ -d /usr/lib/x86_64-linux-gnu/pango ]; then
+       PANGOROOT="/usr/lib/x86_64-linux-gnu"
 else
        echo ""
        echo "!!! ERROR !!! - Unable to locate pango directory. Packager will exit"
@@ -351,9 +353,9 @@ GDKPIXBUFROOT=`pkg-config --libs-only-L gdk-pixbuf-2.0 | sed -e "s/-L//" -e "s/[
 if [ ! -z "$GDKPIXBUFROOT" ]; then
        echo "Found GDKPIXBUFROOT using pkg-config"
 elif [ -d /usr/lib/gdk-pixbuf-2.0 ]; then
-       GDKPIXBUFROOT="/usr/lib/gdk-pixbuf-2.0"
+       GDKPIXBUFROOT="/usr/lib"
 elif [ -d /usr/local/lib/gdk-pixbuf-2.0 ]; then
-       GDKPIXBUFROOT="/usr/local/lib/gdk-pixbuf-2.0"
+       GDKPIXBUFROOT="/usr/local/lib"
 elif [ -d ${GTKLIB}/loaders ]; then  #odd ball case
        GDKPIXBUFROOT=${GTKROOT}
        GDKPIXBUFLIB=${GTKLIB}