diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2010-09-16 13:10:39 +0200 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-09-16 13:10:39 +0200 |
commit | 9a625cd021c2d087a988699dcfc3e512fa163235 (patch) | |
tree | 2fbdefdee370f2cd2c5ee76ec62b9dd9b65cbd9c /mk/buildhlp.mk | |
parent | afab289b265ff987c3f62393b3ef707c2650704f (diff) | |
parent | 4422cda575db22275b067e07ad4b585572d91756 (diff) |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Conflicts:
mk/kernel-build.mk
package/expat/Makefile
package/gettext/Makefile
package/perl/Makefile
package/zlib/Makefile
Diffstat (limited to 'mk/buildhlp.mk')
-rw-r--r-- | mk/buildhlp.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mk/buildhlp.mk b/mk/buildhlp.mk index 4df712fcb..14cee191d 100644 --- a/mk/buildhlp.mk +++ b/mk/buildhlp.mk @@ -29,7 +29,7 @@ post-extract: ifeq ($(strip ${NO_DISTFILES}),1) ${WRKDIST}/.extract_done: rm -rf ${WRKDIST} ${WRKSRC} ${WRKBUILD} - mkdir -p ${WRKDIR} ${WRKDIST} + @mkdir -p ${WRKDIR} ${WRKDIST} ${MAKE} do-extract @${MAKE} post-extract touch $@ @@ -57,9 +57,9 @@ ifeq ($(strip ${__use_generic_patch_target}),42) post-patch: ${WRKDIST}/.prepared: ${WRKDIST}/.extract_done [ ! -d ./patches/${PKG_VERSION} ] || ${PREVENT_PATCH} ${PATCH} ${WRKDIST} ./patches \ - '{patch-!(*.orig),*.patch}' + '{patch-!(*.orig),*.patch}' $(MAKE_TRACE) [ ! -d ./patches ] || ${PREVENT_PATCH} ${PATCH} ${WRKDIST} ./patches \ - '{patch-!(*.orig),*.patch}' + '{patch-!(*.orig),*.patch}' $(MAKE_TRACE) [ ! -d ./src ] || (cd src; $(PREVENT_PATCH) cp -Rp . ${WRKDIST}/) \ $(MAKE_TRACE) @${MAKE} post-patch $(MAKE_TRACE) |