diff options
| author | Baptiste Daroussin <bapt@FreeBSD.org> | 2014-01-27 21:23:49 +0000 |
|---|---|---|
| committer | Baptiste Daroussin <bapt@FreeBSD.org> | 2014-01-27 21:23:49 +0000 |
| commit | 9f2ea862b97adc6effe5d3c8bfc23b710899d351 (patch) | |
| tree | 4f86f60d19083488626b0e4d2b1c70f1cb93b169 /Mk/bsd.port.mk | |
| parent | c07908cbe31308815706a04fbd3c2b56adab3bef (diff) | |
| download | ports-9f2ea862b97adc6effe5d3c8bfc23b710899d351.tar.gz ports-9f2ea862b97adc6effe5d3c8bfc23b710899d351.zip | |
Fix make package-recursive
Keep the ugly way for non staged ports
and properly build the package for staged ports
Tested by: smh
Notes
Notes:
svn path=/head/; revision=341457
Diffstat (limited to 'Mk/bsd.port.mk')
| -rw-r--r-- | Mk/bsd.port.mk | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index 08d66f6d356e..377f2800f029 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -4792,11 +4792,14 @@ pre-repackage: .if !target(package-noinstall) package-noinstall: +.if defined(NO_STAGE) @${MKDIR} ${WRKDIR} - @cd ${.CURDIR} && ${MAKE} pre-package \ - pre-package-script do-package post-package-script + @cd ${.CURDIR} && ${MAKE} ${_PACKAGE_REAL_SEQ} @${RM} -f ${TMPPLIST} -@${RMDIR} ${WRKDIR} +.else + @cd ${.CURDIR} && ${MAKE} package +.endif .endif ################################################################ |