@@ -52,11 +52,15 @@ else cp -rp ../buildsrc/* './' fi cd "${BUILDDIR}" || exit 1 - for dir in unix win macosx; do + for dir in unix win macosx __fail__; do + if [ "${dir}" = "__fail__" ]; then + exit 1 + fi + # Remove previous directory's "tkConfig.sh" if found rm -f 'tkConfig.sh' cd "${BUILDDIR}/${dir}" || exit 1 @@ -74,11 +78,11 @@ ./configure --enable-shared --disable-symbols --prefix="${INSTDIR}" --with-tcl="${TCLCONFIGDIR}" ${CONFIGUREEXTRA} fi ${MAKE:-make} || continue - ${MAKE:-make} install + ${MAKE:-make} install || continue # Update pkgIndex to load libtk from the local directory rather # than the parent directory for pkgIndex in "${INSTDIR}"/lib/tk*/pkgIndex.tcl; do sed 's@ \.\. @ @g' "${pkgIndex}" > "${pkgIndex}.new" @@ -93,10 +97,8 @@ "${STRIP:-strip}" -g "${OUTDIR}"/lib/tk*/*.so >/dev/null 2>/dev/null find "${OUTDIR}" -type f -name '*.a' | xargs rm -f >/dev/null 2>/dev/null break done - - exit 0 ) || exit 1 exit 0