Skip to content

Commit 9b3b457

Browse files
committed
curl.sh: adapt to changes in custom output locations [ci skip]
Invoking the build via cmake seems to have changed the default directory while the build is executed. Custom output files, .map, .def were put within the `lib` and `src` subdir before. This changed to the build root. Change manual install steps for these files to expect their new locations.
1 parent 3a0416c commit 9b3b457

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

curl.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -420,13 +420,13 @@ _VER="$1"
420420
# Manual copy to DESTDIR
421421
422422
if [ "${_OS}" = 'win' ]; then
423-
cp -p "${_BLDDIR}/lib/${_DEF_NAME}" "${_PP}"/bin/
423+
cp -p "${_BLDDIR}/${_DEF_NAME}" "${_PP}"/bin/
424424
fi
425425
426426
if [ "${CW_MAP}" = '1' ]; then
427-
cp -p "${_BLDDIR}/lib/${_MAP_NAME_LIB}" "${_PP}/${DYN_DIR}/"
427+
cp -p "${_BLDDIR}/${_MAP_NAME_LIB}" "${_PP}/${DYN_DIR}/"
428428
if [[ "${_CONFIG}" != *'nocurltool'* ]]; then
429-
cp -p "${_BLDDIR}/src/${_MAP_NAME_BIN}" "${_PP}"/bin/
429+
cp -p "${_BLDDIR}/${_MAP_NAME_BIN}" "${_PP}"/bin/
430430
fi
431431
fi
432432

0 commit comments

Comments
 (0)