Skip to content

Commit

Permalink
curl.sh: adapt to changes in custom output locations [ci skip]
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
vszakats committed Oct 16, 2024
1 parent 3a0416c commit 9b3b457
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions curl.sh
Original file line number Diff line number Diff line change
Expand Up @@ -420,13 +420,13 @@ _VER="$1"
# Manual copy to DESTDIR
if [ "${_OS}" = 'win' ]; then
cp -p "${_BLDDIR}/lib/${_DEF_NAME}" "${_PP}"/bin/
cp -p "${_BLDDIR}/${_DEF_NAME}" "${_PP}"/bin/
fi
if [ "${CW_MAP}" = '1' ]; then
cp -p "${_BLDDIR}/lib/${_MAP_NAME_LIB}" "${_PP}/${DYN_DIR}/"
cp -p "${_BLDDIR}/${_MAP_NAME_LIB}" "${_PP}/${DYN_DIR}/"
if [[ "${_CONFIG}" != *'nocurltool'* ]]; then
cp -p "${_BLDDIR}/src/${_MAP_NAME_BIN}" "${_PP}"/bin/
cp -p "${_BLDDIR}/${_MAP_NAME_BIN}" "${_PP}"/bin/
fi
fi
Expand Down

0 comments on commit 9b3b457

Please sign in to comment.