Skip to content

Commit

Permalink
subpackages: fix minor regression
Browse files Browse the repository at this point in the history
Before subpackages, when running package there where 2 cases:
case 1: ${PACKAGES} directory exist:
  packages are created in the work/pkg directory then copies into
  ${PACKAGES} directory
case 2: ${PACKAGES} does not exist:
  packages where only created in work/pkg

After subpackages in the case 2, the packages get copied into the
  directory actually running the make package comment.

This change makes the framework behave like before subpackages

Reported by:	Antonio Huete Jimenez (tuxilio from Dragonfly irc
		channel)
  • Loading branch information
bapt committed Feb 12, 2024
1 parent 5d01dea commit e1584ae
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions Mk/bsd.port.mk
Original file line number Diff line number Diff line change
Expand Up @@ -3487,11 +3487,13 @@ ${WRKDIR_PKGFILE${_SP.${sp}}}: ${_PLIST}.${sp} create-manifest ${WRKDIR}/pkg

_EXTRA_PACKAGE_TARGET_DEP+= ${WRKDIR_PKGFILE${_SP.${sp}}}

. if defined(_HAVE_PACKAGES)
${PKGFILE${_SP.${sp}}}: ${WRKDIR_PKGFILE${_SP.${sp}}}
@${LN} -f ${WRKDIR_PKGFILE${_SP.${sp}}} ${PKGFILE${_SP.${sp}}} 2>/dev/null \
|| ${CP} -f ${WRKDIR_PKGFILE${_SP.${sp}}} ${PKGFILE${_SP.${sp}}}

_EXTRA_PACKAGE_TARGET_DEP+= ${PKGFILE${_SP.${sp}}}
. endif
. endfor
# This will be the end of the loop

Expand Down

0 comments on commit e1584ae

Please sign in to comment.