inputenc only expects one option

[lyx.git] / development / LyX-Mac-binary-release.sh

diff --git a/development/LyX-Mac-binary-release.sh b/development/LyX-Mac-binary-release.sh
index cc7320de405ddb664343ee64ac096e5729667a91..f2683fec4497d69203f557745a82efbde89b5488 100644 (file)
--- a/development/LyX-Mac-binary-release.sh
+++ b/development/LyX-Mac-binary-release.sh
@@ -285,7 +285,6 @@ while [ $# -gt 0 ]; do
                shift
                ;;
        --enable-cxx11|--enable-cxx-mode=*)
-               LyXConfigureOptions="${LyXConfigureOptions} ${1}"
                EnableCXXMode="${1}"
                shift
                ;;
@@ -300,7 +299,7 @@ while [ $# -gt 0 ]; do
 done
 
 if [ "${configure_qt_frameworks}" != "yes" ]; then
-       QtInstallDir=${QTDIR:-"/opt/qt4"}
+       QtInstallDir=${QTDIR}
 fi
 
 ARCH_LIST=${ARCH_LIST:-"ppc i386"}
@@ -423,11 +422,13 @@ case "${EnableCXXMode}" in
        export CC=cc
        export CXX="c++ -stdlib=libc++"
        export CXXFLAGS=-std=c++11
+       LyXConfigureOptions="${LyXConfigureOptions} --enable-cxx-mode=11"
        ;;
 --enable-cxx-mode=17)
        export CC=cc
        export CXX="c++ -stdlib=libc++"
        export CXXFLAGS=-std=c++17
+       LyXConfigureOptions="${LyXConfigureOptions} ${EnableCXXMode}"
        ;;
 esac
 
@@ -1011,15 +1012,18 @@ EOF
 # The image was made with with inkscape and tiffutil from dmg-background.svgz
 make_image() {
        INKSCAPE=/Applications/Inkscape.app/Contents/MacOS/inkscape
-       cd "${LyxSourceDir}"/development/MacOSX
-       ${INKSCAPE} --export-type=png -w 560 -o dmg-background.png dmg-background.svgz
-       ${INKSCAPE} --export-type=png -w 1120 -o dmg-background@2x.png dmg-background.svgz
-       tiffutil -cathidpicheck dmg-background.png dmg-background@2x.png -out dmg-background.tiff
+       (
+               cd "${LyxSourceDir}"/development/MacOSX
+               test -x ${INKSCAPE} && ${INKSCAPE} --export-type=png -w 560 -o dmg-background.png dmg-background.svgz
+               test -x ${INKSCAPE} && ${INKSCAPE} --export-type=png -w 1120 -o dmg-background@2x.png dmg-background.svgz
+               tiffutil -cathidpicheck dmg-background.png dmg-background@2x.png -out dmg-background.tiff
+       )
 }
 
 make_dmg() {
        cd "${1}"
 
+       test -f "${DmgBackground}" || make_image
        BGSIZE=$(file "$DmgBackground" | awk -F , '/TIFF/{ print $10 $4 ;}/PNG/{ print $2; }'|sed -e 's/width=//' -e 's/height=//' -e 's/x//')
        BG_W=$(echo ${BGSIZE} | awk '{print $1 }')
        BG_H=$(echo ${BGSIZE} | awk '{print $2 }')