place generated bindings files in gtk2_ardour/

[ardour.git] / tools / linux_packaging / stage2.run.in

diff --git a/tools/linux_packaging/stage2.run.in b/tools/linux_packaging/stage2.run.in
index ba8e280a3a2f8228dfa2e107738601cabc5c44e3..445643b573b2705d82b3e02a31658ecac958c83a 100755 (executable)
--- a/tools/linux_packaging/stage2.run.in
+++ b/tools/linux_packaging/stage2.run.in
@@ -287,7 +287,7 @@ if %REPLACE_GCC5%; then
                echo ""
                echo "WARNING: GCC4/5 libstdc++ ABI Mismatch"
                echo ""
-               echo "Ardour was compiled with gcc5, your system uses an older version of the"
+               echo "${PGM_NAME} was compiled with gcc5, your system uses an older version of the"
                echo "standard c++ library. Plugins on your system may not load or plugin-UIs"
                echo "may cause crashes."
                echo ""
@@ -302,7 +302,7 @@ else
                echo ""
                echo "WARNING: GCC4/5 libstdc++ ABI Mismatch"
                echo ""
-               echo "Ardour was compiled with gcc4, your system uses a newer version of the"
+               echo "${PGM_NAME} was compiled with gcc4, your system uses a newer version of the"
                echo "standard c++ library. Plugins on your system may not load or plugin-UIs"
                echo "may cause crashes."
                echo ""
@@ -314,11 +314,11 @@ else
 fi
 
 if %REPLACE_WINE%; then
-       if -z "`which wine`"; then
+       if test -z "`which wine`"; then
                echo ""
                echo "!!! ERROR !!! - 'wine' was not found."
                echo ""
-               echo "This version of Ardour with Windows VST support requires wine."
+               echo "This version of ${PGM_NAME} with Windows VST support requires wine."
                echo "https://www.winehq.org/"
                echo ""
                read -p "Press ENTER to exit installer:" BLAH
@@ -393,8 +393,7 @@ fi
 #################################################
 if %REPLACE_WINE%; then
        echo ""
-       echo "Searching for libwine.so (Windows VST support)"
-       echo ""
+       echo "Searching libwine.so (Windows VST support)"
        # we need to add libwine to ardour's LD_LIBRARY_PATH
        # libwine itself includes paths to the various system-components
        # which may be different on each platform.
@@ -411,10 +410,18 @@ if %REPLACE_WINE%; then
        # if this check were quick and easy.. it should be done in the startup-script, but it's not
        # so here we go... (updating wine may require re-installing ardour)
        #
+       # on recent Ubuntu wine does load both:
+       #   /usr/lib/i386-linux-gnu/libwine.so.1
+       # AND
+       #   /usr/lib/x86_64-linux-gnu/libwine.so.1
+       # so we need to work around this (thanks).
+       # (this hack break 64bit LinuxVST builds, but we don't do those anyway)
+
        LIBWINE=$(
                LD_DEBUG=files wine `pwd`/${BUNDLE_DIR}/lib/ardour-vst-scanner.exe.so 2>&1 \
                                                 | grep -e "calling init:.*libwine" \
                                                 | sed 's/^.*calling init: //' \
+                                                | grep -v x86_64-linux-gnu \
                                                 | uniq \
                        )
        if ! test -f "$LIBWINE"; then
@@ -424,6 +431,7 @@ if %REPLACE_WINE%; then
                read -p "Press ENTER to exit installer:" BLAH
                exit 1
        fi
+       echo "Using: $LIBWINE"
   # this replaces/overwrites the bundled libwine
        cp -L "$LIBWINE" `pwd`/${BUNDLE_DIR}/lib/libwine.so.1
 fi
@@ -837,7 +845,7 @@ then
                echo ""
                echo "!!! WARNING !!! - Your system seems to use frequency scaling."
                echo "This can have a serious impact on audio latency."
-               echo "For best results turn it off, e.g. by chosing the 'performance' governor."
+               echo "For best results turn it off, e.g. by choosing the 'performance' governor."
                echo ""
                read -p "Press ENTER to continue:" BLAH
        fi