diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2012-05-24 16:19:41 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2012-05-24 16:19:41 +0000 |
| commit | 72fa409664f1153bacdade5e6d2ca97c7adab4a6 (patch) | |
| tree | c789eaf7f10def90628fbeacec2844e7aeed39fd /tools | |
| parent | 10c6490d54a5cd1daa0c330ac3255b92c836261a (diff) | |
more build script cleanups
git-svn-id: svn://localhost/ardour2/branches/3.0@12423 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/linux_packaging/build | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/tools/linux_packaging/build b/tools/linux_packaging/build index bc40eedcb1..4e715e77c9 100755 --- a/tools/linux_packaging/build +++ b/tools/linux_packaging/build @@ -298,24 +298,19 @@ cp -R $GTKSTACK_ROOT/lib/gdk-pixbuf-2.0/2.10.0/loaders/*.so $Loaders # charset alias file cp -R $GTKSTACK_ROOT/lib/charset.alias $Etc -pango-querymodules | sed "s?$PANGOLIB/?@ROOTDIR@/?" > $Etc/pango.modules.in -gdk-pixbuf-query-loaders | sed "s?$GDKPIXBUFLIB/?@ROOTDIR@/?" > $Etc/gdk-pixbuf.loaders.in +pango-querymodules | sed "s?$GTKSTACK_ROOT/lib/pango/1.6.0/?@ROOTDIR@/?" > $Etc/pango.modules.in +gdk-pixbuf-query-loaders | sed "s?$GTKSTACK_ROOT/lib/gdk-pixbuf-2.0/2.10.0/?@ROOTDIR@/?" > $Etc/gdk-pixbuf.loaders.in # We sort of rely on clearlooks, so include a version # this one is special - we will set GTK_PATH to $Libraries/clearlooks -if [ ! -e ${GTKLIB}/engines/libclearlooks.so ]; then - if [ ! -e $BUILD_ROOT/libs/clearlooks-newer/libclearlooks.so ] ; then - echo "" +clearlooks_so=${GTKLIB}/engines/libclearlooks.so +if [ ! -e $clearlooks.so ]; then echo "!!! ERROR !!! - not able to locate libclearlooks.so" echo "" echo "Packager with exit" exit 1 - else - clearlooks_so=$BUILD_ROOT/libs/clearlooks-newer/libclearlooks.so - fi else - clearlooks_so=${GTKLIB}/engines/libclearlooks.so fi echo "Copying clearlooks ..." |