diff options
| author | Carl Hetherington <carl@carlh.net> | 2012-04-25 16:55:34 +0000 |
|---|---|---|
| committer | Carl Hetherington <carl@carlh.net> | 2012-04-25 16:55:34 +0000 |
| commit | 4f29bb60464dced12f599ca2d5716633a5afdbe0 (patch) | |
| tree | c7b2c41c61decc404cd128f1c3f6447254729e40 /tools | |
| parent | b150474b262f7c0dcf95b0d5d2b61d78e34591b0 (diff) | |
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
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/linux_packaging/build | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tools/linux_packaging/build b/tools/linux_packaging/build index f2fa1293ec..75e32f7f60 100755 --- 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} |