]> git.lyx.org Git - lyx.git/commitdiff
Qt5.5 cannot be build in parallel anymore
authorStephan Witt <switt@lyx.org>
Wed, 8 Jul 2015 16:01:05 +0000 (18:01 +0200)
committerStephan Witt <switt@lyx.org>
Wed, 8 Jul 2015 16:01:05 +0000 (18:01 +0200)
Automatic symlink creation for Qt frameworks

development/LyX-Mac-binary-release.sh

index 76bf79b0f2fa83aba93700f40bf0e5b623e98dcd..16bada01d85504f9d8dba4077a79d048074ce84d 100644 (file)
@@ -387,13 +387,16 @@ if [ "${configure_qt_frameworks}" != "yes" -a -d "${QtSourceDir}" -a ! \( -d "${
                echo configure options:
                echo ${QtConfigureOptions} ${ARCHS} -prefix "${QtInstallDir}"
                "${QtSourceDir}"/configure ${QtConfigureOptions} ${ARCHS} -prefix "${QtInstallDir}"
-               make ${MAKEJOBS} && make install
+               make -j1 && make -j1 install
        )
+fi
+if [ -d "${QtInstallDir}" -a ! -f "${QtInstallDir}"/include/QtCore ]; then
        cd "${QtInstallDir}" && (
                mkdir -p include
                cd include
                for libnm in ${QtLibraries} ; do
-                       test -d ${libnm} -o -L ${libnm} || ln -s ../lib/${libnm}.framework/Headers ${libnm}
+                       test -d ${libnm} -o -L ${libnm} || \
+                       ( ln -s ../lib/${libnm}.framework/Headers ${libnm} && echo Link to framework ${libnm} )
                done
        )
 fi