Skip to content

Commit

Permalink
fixup curl map/def dirs for gnu make
Browse files Browse the repository at this point in the history
  • Loading branch information
vszakats committed Oct 16, 2024
1 parent 6c8c588 commit 85befff
Showing 1 changed file with 12 additions and 3 deletions.
15 changes: 12 additions & 3 deletions curl.sh
Original file line number Diff line number Diff line change
Expand Up @@ -419,14 +419,23 @@ _VER="$1"
# Manual copy to DESTDIR
# These custom outputs end up in different directories depending on make tool
if [ "${_MK}" = 'ninja' ]; then
_out_lib=''
_out_src=''
else
_out_lib='lib/'
_out_src='src/'
fi
if [ "${_OS}" = 'win' ]; then
cp -p "${_BLDDIR}/${_DEF_NAME}" "${_PP}"/bin/
cp -p "${_BLDDIR}/${_out_lib}${_DEF_NAME}" "${_PP}"/bin/
fi
if [ "${CW_MAP}" = '1' ]; then
cp -p "${_BLDDIR}/${_MAP_NAME_LIB}" "${_PP}/${DYN_DIR}/"
cp -p "${_BLDDIR}/${_out_lib}${_MAP_NAME_LIB}" "${_PP}/${DYN_DIR}/"
if [[ "${_CONFIG}" != *'nocurltool'* ]]; then
cp -p "${_BLDDIR}/${_MAP_NAME_BIN}" "${_PP}"/bin/
cp -p "${_BLDDIR}/${_out_src}${_MAP_NAME_BIN}" "${_PP}"/bin/
fi
fi
Expand Down

0 comments on commit 85befff

Please sign in to comment.