Diff

Differences From Artifact [a0fc7f495f]:

To Artifact [c5ef63a316]:


   237    237   
   238    238   		# Remove broken pre-generated Makfiles
   239    239   		rm -f GNUmakefile Makefile makefile
   240    240   
   241    241   		echo "Running: ./configure --disable-shared --with-encoding=utf-8 --prefix=\"${INSTDIR}\" --libdir=\"${INSTDIR}/lib\" ${CONFIGUREEXTRA}"
   242    242   		./configure --disable-shared --with-encoding=utf-8 --prefix="${INSTDIR}" --libdir="${INSTDIR}/lib" ${CONFIGUREEXTRA}
   243    243   
   244         -		echo "Running: ${MAKE:-make}"
   245         -		${MAKE:-make} || continue
          244  +		echo "Running: ${MAKE:-make} binaries"
          245  +		${MAKE:-make} binaries || continue
   246    246   
   247         -		echo "Running: ${MAKE:-make} install"
   248         -		${MAKE:-make} install || (
          247  +		echo "Running: ${MAKE:-make} install-binaries install-libraries"
          248  +		${MAKE:-make} install-binaries install-libraries || (
   249    249   			# Work with Tcl 8.6.x's TCLSH_NATIVE solution for
   250    250   			# cross-compile installs
   251    251   
   252         -			echo "Running: ${MAKE:-make} install TCLSH_NATIVE=\"${TCLSH_NATIVE}\""
   253         -			${MAKE:-make} install TCLSH_NATIVE="${TCLSH_NATIVE}"
          252  +			echo "Running: ${MAKE:-make} install-binaries install-libraries TCLSH_NATIVE=\"${TCLSH_NATIVE}\""
          253  +			${MAKE:-make} install-binaries install-libraries TCLSH_NATIVE="${TCLSH_NATIVE}"
   254    254   		) || (
   255    255   			# Make install can fail if cross-compiling using Tcl 8.5.x
   256    256   			# because the Makefile calls "$(TCLSH)".  We can't simply
   257    257   			# redefine TCLSH because it also uses TCLSH as a build target
   258    258   			sed 's@^$(TCLSH)@blah@' Makefile > Makefile.new
   259    259   			cat Makefile.new > Makefile
   260    260   			rm -f Makefile.new
   261    261   
   262         -			echo "Running: ${MAKE:-make} install TCLSH=\"../../../../../../../../../../../../../../../../../$(which "${TCLSH_NATIVE}")\""
   263         -			${MAKE:-make} install TCLSH="../../../../../../../../../../../../../../../../../$(which "${TCLSH_NATIVE}")"
          262  +			echo "Running: ${MAKE:-make} install-binaries install-libraries TCLSH=\"../../../../../../../../../../../../../../../../../$(which "${TCLSH_NATIVE}")\""
          263  +			${MAKE:-make} install-binaries install-libraries TCLSH="../../../../../../../../../../../../../../../../../$(which "${TCLSH_NATIVE}")"
   264    264   		) || (
   265    265   			# Make install can fail if cross-compiling using Tcl 8.5.9
   266    266   			# because the Makefile calls "${TCL_EXE}".  We can't simply
   267    267   			# redefine TCL_EXE because it also uses TCL_EXE as a build target
   268    268   			sed 's@^${TCL_EXE}@blah@' Makefile > Makefile.new
   269    269   			cat Makefile.new > Makefile
   270    270   			rm -f Makefile.new
   271    271   
   272         -			echo "Running: ${MAKE:-make} install TCL_EXE=\"../../../../../../../../../../../../../../../../../$(which "${TCLSH_NATIVE}")\""
   273         -			${MAKE:-make} install TCL_EXE="../../../../../../../../../../../../../../../../../$(which "${TCLSH_NATIVE}")"
          272  +			echo "Running: ${MAKE:-make} install-binaries install-libraries TCL_EXE=\"../../../../../../../../../../../../../../../../../$(which "${TCLSH_NATIVE}")\""
          273  +			${MAKE:-make} install-binaries install-libraries TCL_EXE="../../../../../../../../../../../../../../../../../$(which "${TCLSH_NATIVE}")"
   274    274   		) || exit 1
   275    275   
   276    276   		mkdir "${OUTDIR}/lib" || exit 1
   277    277   		cp -r "${INSTDIR}/lib"/* "${OUTDIR}/lib/"
   278    278   		rm -rf "${OUTDIR}/lib/pkgconfig"
   279    279   		rm -f "${OUTDIR}"/lib/* >/dev/null 2>/dev/null
   280    280   		find "${OUTDIR}" -name '*.a' | xargs rm -f >/dev/null 2>/dev/null