diff --git a/tools/linux_packaging/build b/tools/linux_packaging/build index 2d7d8208ba..c0503988af 100755 --- a/tools/linux_packaging/build +++ b/tools/linux_packaging/build @@ -400,14 +400,14 @@ if test x$WITH_LADSPA != x ; then fi # XXX STILL NEED TO DO PANNERS FOR TRUNK -cp ../../libs/surfaces/*/libardour_*.so* $Surfaces +cp $BUILD_ROOT/libs/surfaces/*/libardour_*.so* $Surfaces # hack ... move libardour_cp back into Libraries mv $Surfaces/libardour_cp.so* $Libraries # VAMP plugins that we use -cp ../../libs/vamp-plugins/libardourvampplugins.so* $Libraries +cp $BUILD_ROOT/libs/vamp-plugins/libardourvampplugins.so* $Libraries -OURLIBDIR=../../libs +OURLIBDIR=$BUILD_ROOT/libs OURLIBS=$OURLIBDIR/vamp-sdk:$OURLIBDIR/surfaces/control_protocol:$OURLIBDIR/ardour:$OURLIBDIR/midi++2:$OURLIBDIR/pbd:$OURLIBDIR/rubberband:$OURLIBDIR/soundtouch:$OURLIBDIR/gtkmm2ext:$OURLIBDIR/sigc++2:$OURLIBDIR/glibmm2:$OURLIBDIR/gtkmm2/atk:$OURLIBDIR/gtkmm2/pango:$OURLIBDIR/gtkmm2/gdk:$OURLIBDIR/gtkmm2/gtk:$OURLIBDIR/libgnomecanvasmm:$OURLIBDIR/libsndfile echo $OURLIBS${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} @@ -467,8 +467,8 @@ while [ true ] ; do if ! test -f $Libraries/$base; then parent=$(basename ${file}) if echo $dep | grep -sq '^libs' ; then - echo "Copying dependant lib ../../$dep (required by ${parent})" - cp ../../$dep $Libraries + echo "Copying dependant lib $BUILD_ROOT/$dep (required by ${parent})" + cp $BUILD_ROOT/$dep $Libraries else echo "Copying dependant lib $dep (required by ${parent})" cp $dep $Libraries