initialize uninitialized variable

[ardour.git] / tools / linux_packaging / build

diff --git a/tools/linux_packaging/build b/tools/linux_packaging/build
index ae105340b1878ccb9e6a18e7fcf4edd84f478cec..cee48ced28971fa9f861cb96662585cbaa0edab4 100755 (executable)
--- a/tools/linux_packaging/build
+++ b/tools/linux_packaging/build
@@ -80,6 +80,7 @@ while [ $# -gt 0 ] ; do
                major_version=""
                shift ;;
        --public)
+               WITH_HARRISON_LV2=1 ;
                WITH_NLS=1 ;
                WITH_LADSPA=;
                STRIP=all ;
@@ -393,6 +394,9 @@ done
 # Lua Scripts Files
 # got to be careful with names here
 for x in $BUILD_ROOT/../scripts/*.lua ; do
+         if test "${x:0:1}" = "_"; then
+                       continue;
+               fi
     cp "$x" $LuaScripts
 done
 
@@ -469,7 +473,15 @@ OURLIBS=$OURLIBDIR/vamp-sdk:$OURLIBDIR/surfaces/control_protocol:$OURLIBDIR/ardo
 echo $OURLIBS${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
 
 checkedIdx=0
-deplibs=
+
+# these are dynamically loaded by NSS
+deplibs="libfreeblpriv3.so libsoftokn3.so libnsspem.so"
+cp -v $GTKSTACK_ROOT/lib/libsoftokn3.so $Libraries/
+cp -v $GTKSTACK_ROOT/lib/libfreeblpriv3.so $Libraries/
+cp -v $GTKSTACK_ROOT/lib/libnsspem.so $Libraries/
+chrpath -r foo $Libraries/libsoftokn3.so
+chrpath -r foo $Libraries/libfreeblpriv3.so
+chrpath -r foo $Libraries/libnsspem.so
 
 while [ true ] ; do
        missing=false
@@ -593,13 +605,13 @@ mkdir ${Shared}/resources
 cp ../../system_config $Etc/system_config
 cp ../../instant.xml $Shared/instant.xml
 cp ../../gtk2_ardour/icons/*.png ${Shared}/icons
-cp -r ../../gtk2_ardour/icons/icons/cursor_* ${Shared}/icons/
+cp -r ../../gtk2_ardour/icons/cursor_* ${Shared}/icons/
 cp ../../gtk2_ardour/ArdourMono.ttf $Shared
 cp ../../gtk2_ardour/resources/${APPNAME}-* ${Shared}/resources/
 
 # Themes: only install those named for this app
 lower_case_appname=`echo $APPNAME | tr '[:upper:]' '[:lower:]'`
-cp `echo ../../gtk2_ardour/themes/*-${lower_case_appname}.colors` $Themes
+cp ../../gtk2_ardour/themes/*-${lower_case_appname}.colors $Themes
 
 #
 # put sooper sekrit ingredients here and they will be copied
@@ -733,8 +745,8 @@ fi
 
 echo "Building tarball ..."
 
-rm -f $APPDIR.tar.bz2
-tar -cjf $APPDIR.tar.bz2 $APPDIR
+rm -f $APPDIR.tar
+tar -cf $APPDIR.tar $APPDIR
 
 echo "Calculating bundle size"
 du -sb $APPDIR/  | awk '{print $1}' > $APPDIR.size