Diff

Differences From Artifact [756d463b89]:

To Artifact [007052aec1]:


   101    101   	rm -f configure.new
   102    102   	
   103    103   	(
   104    104   	    # Build
   105    105   	    echo "Running: ./configure $tryopt --disable-symbols --prefix=\"${INSTDIR}\" --exec-prefix=\"${INSTDIR}\" --libdir=\"${INSTDIR}/lib\" --with-tcl=\"${TCLCONFIGDIR}\" ${CONFIGUREEXTRA}"
   106    106   	    ./configure $tryopt --disable-symbols --prefix="${INSTDIR}" --exec-prefix="${INSTDIR}" --libdir="${INSTDIR}/lib" --with-tcl="${TCLCONFIGDIR}" ${CONFIGUREEXTRA}
   107    107   
   108         -	    if [ "${KC_CROSSCOMPILE}" = '1' ]; then
   109         -                ## Cross-compiling, use TCLSH_NATIVE
   110         -		echo "Running: ${MAKE:-make} TCLSH=${TCLSH_NATIVE}"
   111         -		${MAKE:-make} TCLSH=${TCLSH_NATIVE} || exit 1
   112         -		
          108  +	    echo "Running: ${MAKE:-make}"
          109  +	    ${MAKE:-make} || exit 1
          110  +
          111  +	    echo "Running: ${MAKE:-make} install"
          112  +	    ${MAKE:-make} install || (
          113  +		## cross-compiling? use TCLSH_NATIVE
   113    114   		echo "Running: ${MAKE:-make} install TCLSH=${TCLSH_NATIVE}"
   114    115   		${MAKE:-make} install TCLSH=${TCLSH_NATIVE} || exit 1
   115         -	    else
   116         -		echo "Running: ${MAKE:-make}"
   117         -		${MAKE:-make} || exit 1
   118         -		
   119         -		echo "Running: ${MAKE:-make} install"
   120         -		${MAKE:-make} install || exit 1
   121         -            fi
   122         -	    
          116  +	    ) || exit 1
   123    117   	) || continue
   124    118   	
   125    119   	break
   126    120       done
   127    121       
   128    122       mkdir "${OUTDIR}/lib" || exit 1
   129    123       cp -r "${INSTDIR}/lib"/nsf*/serialize "${OUTDIR}/lib/nsf${NSFVERS}-serialize"