diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-02-26 14:29:47 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-02-26 14:29:47 +0100 |
| commit | 8ce8412b8200de0d91617b9dc20455a6f8582b1b (patch) | |
| tree | 1d27e250c3f5fe2fbb75eb1cde7a2deef66a73e9 /mk/package.mk | |
| parent | c2538805045d5a958ceb7974dec056ad45367d98 (diff) | |
use separate stamp dir, enable openjdk for hudson
Diffstat (limited to 'mk/package.mk')
| -rw-r--r-- | mk/package.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mk/package.mk b/mk/package.mk index b9b198e57..125ed3d26 100644 --- a/mk/package.mk +++ b/mk/package.mk @@ -78,7 +78,7 @@ _PATCH_COOKIE= ${WRKDIST}/.prepared _CONFIGURE_COOKIE= ${WRKBUILD}/.configure_done _BUILD_COOKIE= ${WRKBUILD}/.build_done _FAKE_COOKIE= ${WRKINST}/.fake_done -_IPKGS_COOKIE= ${STAGING_PKG_DIR}/${PKG_NAME}${PKG_VERSION}-${PKG_RELEASE} +_IPKGS_COOKIE= ${STAGING_PKG_DIR}/stamps/${PKG_NAME}${PKG_VERSION}-${PKG_RELEASE} _IN_PACKAGE:= 1 include ${TOPDIR}/mk/buildhlp.mk @@ -225,7 +225,7 @@ ifneq (${ADK_INSTALL_PACKAGE_NETWORK_SCRIPTS},y) -rm -rf $${IDIR_$(1)}/etc/network endif endif - @mkdir -p $${PACKAGE_DIR} '$${STAGING_PKG_DIR}' \ + @mkdir -p $${PACKAGE_DIR} '$${STAGING_PKG_DIR}/stamps' \ '$${STAGING_DIR}/scripts' ifeq (,$(filter noremove,$(7))) @if test -s '$${STAGING_PKG_DIR}/$(1)'; then \ @@ -321,7 +321,7 @@ clean-targets: clean: @$(CMD_TRACE) "cleaning... " @$(MAKE) clean-targets $(MAKE_TRACE) - rm -rf ${WRKDIR} ${ALL_IPKGS} ${STAGING_PKG_DIR}/${PKG_NAME}* + rm -rf ${WRKDIR} ${ALL_IPKGS} ${STAGING_PKG_DIR}/stamps/${PKG_NAME}* distclean: clean rm -f ${FULLDISTFILES} |