diff options
| author | rillig <rillig@pkgsrc.org> | 2006-10-08 20:24:03 +0000 |
|---|---|---|
| committer | rillig <rillig@pkgsrc.org> | 2006-10-08 20:24:03 +0000 |
| commit | bd28a894fdab8732b238155548941e99a1fd6f0c (patch) | |
| tree | fd66dcd27cd263733a337b07b4dbcaa63a79f300 /mk/flavor/pkg | |
| parent | 47006521f2c61601770d77ea08bad3c11e4f1073 (diff) | |
| download | pkgsrc-bd28a894fdab8732b238155548941e99a1fd6f0c.tar.gz | |
Made the code simpler and added "set -e".
Diffstat (limited to 'mk/flavor/pkg')
| -rw-r--r-- | mk/flavor/pkg/package.mk | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/mk/flavor/pkg/package.mk b/mk/flavor/pkg/package.mk index 303fdb75cd0..d27e8b2a9cb 100644 --- a/mk/flavor/pkg/package.mk +++ b/mk/flavor/pkg/package.mk @@ -1,4 +1,4 @@ -# $NetBSD: package.mk,v 1.3 2006/10/06 14:51:36 joerg Exp $ +# $NetBSD: package.mk,v 1.4 2006/10/08 20:24:03 rillig Exp $ PKG_SUFX?= .tgz PKGFILE?= ${PKGREPOSITORY}/${PKGNAME}${PKG_SUFX} @@ -37,14 +37,13 @@ _PKG_ARGS_PACKAGE+= -E ${PKGFILE}: ${_CONTENTS_TARGETS} ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H} - ${_PKG_SILENT}${_PKG_DEBUG} \ - ${PKG_CREATE} ${_PKG_ARGS_PACKAGE} ${.TARGET}; \ - exitcode=$$?; \ - if ${TEST} $$exitcode -ne 0; then \ - ${ERROR_MSG} "(${PKG_CREATE:T}: exitcode $$exitcode)"; \ + ${_PKG_SILENT}${_PKG_DEBUG} set -e; \ + ${PKG_CREATE} ${_PKG_ARGS_PACKAGE} ${.TARGET} || { \ + exitcode=$$?; \ + ${ERROR_MSG} "${PKG_CREATE:T} failed ($$exitcode)"; \ ${RM} -f ${.TARGET}; \ exit 1; \ - fi + } ###################################################################### ### package-remove (PRIVATE) |