Diff

Differences From Artifact [65b4c2995f]:

To Artifact [bd63ad37a9]:


    35     35   	cd "${BUILDDIR}" || exit 1
    36     36   	for dir in unix win macosx; do
    37     37   		# Remove previous directory's "tkConfig.sh" if found
    38     38   		rm -f 'tkConfig.sh'
    39     39   
    40     40   		cd "${BUILDDIR}/${dir}" || exit 1
    41     41   
    42         -		./configure --disable-shared --prefix="${INSTDIR}" --with-tcl="${TCLCONFIGDIR}" ${CONFIGUREEXTRA}
           42  +		./configure --enable-shared --prefix="${INSTDIR}" --with-tcl="${TCLCONFIGDIR}" ${CONFIGUREEXTRA}
    43     43   
    44     44   		"${MAKE:-make}" || continue
    45     45   
    46     46   		"${MAKE:-make}" install
           47  +
           48  +		# Update pkgIndex to load libtk from the local directory rather
           49  +		# than the parent directory
           50  +		for pkgIndex in "${INSTDIR}"/lib/tk*/pkgIndex.tcl; do
           51  +			sed 's@ \.\. @ @g' "${pkgIndex}" > "${pkgIndex}.new"
           52  +			mv "${pkgIndex}.new" "${pkgIndex}"
           53  +		done
    47     54   
    48     55   		mkdir "${OUTDIR}/lib" || exit 1
    49     56   		cp -r "${INSTDIR}/lib"/tk*/ "${OUTDIR}/lib/"
           57  +		cp -r "${INSTDIR}/lib"/libtk* "${OUTDIR}/lib"/tk*/
    50     58   
    51     59   		break
    52     60   	done
    53     61   ) || exit 1
    54     62   
    55     63   exit 0