diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2010-10-22 01:22:41 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2010-10-22 01:22:41 +0000 |
| commit | 2885898bd2dc2b6402049cb1ca2cca21ed9b5a05 (patch) | |
| tree | 0e0cee89359854d98acd3d0714b8d0006a86eb0b /tools | |
| parent | 1bfb94d1b5f010dfe613b721baaecc24ad40c706 (diff) | |
more bundle build tweaks
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@7915 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/linux_packaging/ardour.sh.in | 10 | ||||
| -rwxr-xr-x | tools/linux_packaging/build | 4 |
2 files changed, 4 insertions, 10 deletions
diff --git a/tools/linux_packaging/ardour.sh.in b/tools/linux_packaging/ardour.sh.in index c3731fa7a9..cc9b4ff526 100644 --- a/tools/linux_packaging/ardour.sh.in +++ b/tools/linux_packaging/ardour.sh.in @@ -23,14 +23,10 @@ export GTK_PATH=$INSTALL_DIR${GTK_PATH:+:$GTK_PATH} export LD_LIBRARY_PATH=$INSTALL_DIR/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} # create install-location-dependent config files for Pango and GDK image loaders +# We have to do this every time because its possible that BIN_DIR has changed -if [ ! -f $USER_ARDOUR_DIR/pango.modules ] ; then - sed "s?@ROOTDIR@/modules?$LIB_DIR/modules?" < $ETC_DIR/pango.modules.in > $USER_ARDOUR_DIR/pango.modules -fi - -if [ ! -f $USER_ARDOUR_DIR/gdk-pixbuf.loaders ] ; then - sed "s?@ROOTDIR@/loaders?$LIB_DIR/modules?" < $ETC_DIR/gdk-pixbuf.loaders.in > $USER_ARDOUR_DIR/gdk-pixbuf.loaders -fi +sed "s?@ROOTDIR@/modules?$LIB_DIR/modules?" < $ETC_DIR/pango.modules.in > $USER_ARDOUR_DIR/pango.modules +sed "s?@ROOTDIR@/loaders?$LIB_DIR/modules?" < $ETC_DIR/gdk-pixbuf.loaders.in > $USER_ARDOUR_DIR/gdk-pixbuf.loaders exec $INSTALL_DIR/bin/ardour-2.8.11 "$@" diff --git a/tools/linux_packaging/build b/tools/linux_packaging/build index 0d513b344b..70acf1ed6d 100755 --- a/tools/linux_packaging/build +++ b/tools/linux_packaging/build @@ -362,7 +362,7 @@ for svndir in `find $APPDIR -name .svn -type d`; do done # -# and now ... the DMG +# and now ... the final package # if [ x$SAE != x ] ; then @@ -384,8 +384,6 @@ elif [ x$MIXBUS != x ] ; then if [ -x $EXTERNAL_JACK != x ] ; then cp $EXTERNAL_JACK $PRODUCT_PKG_DIR fi - - # create dmg fi echo "Building tarball ..." |