diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2013-10-29 10:34:52 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2013-10-29 10:34:52 +0100 |
| commit | 99c78117e05ac2795a27b6c3579c5cda02f87000 (patch) | |
| tree | 65be7effe0ce237664d734ef06a3a1419094f252 /mk | |
| parent | dbb81c6054d70e3ab797f7830837402a97e93db1 (diff) | |
| parent | 5e905de49e0b3e1009bab32c62114043a14f286e (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/buildhlp.mk | 6 | ||||
| -rw-r--r-- | mk/pkg-bottom.mk | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/mk/buildhlp.mk b/mk/buildhlp.mk index 8b6a4a8c8..41f09d946 100644 --- a/mk/buildhlp.mk +++ b/mk/buildhlp.mk @@ -95,15 +95,15 @@ else endif @-test -r ${WRKDIR}/.autoreconf_done && \ (cd ${WRKDIR}.orig/${PKG_NAME}-${PKG_VERSION}; \ - env ${AUTOTOOL_ENV} autoreconf -if) + env ${AUTOTOOL_ENV} autoreconf -if) $(MAKE_TRACE) @rm -rf ${WRKDIR}.orig/${PKG_NAME}-${PKG_VERSION}/autom4te.cache @# restore config.sub/config.guess - @for i in $$(find ${WRKDIR}.orig -name config.sub);do \ + @for i in $$(find ${WRKDIR} -name config.sub);do \ if [ -f $$i.bak ];then \ mv $$i.bak $$i; \ fi;\ done - @for i in $$(find ${WRKDIR}.orig -name config.guess);do \ + @for i in $$(find ${WRKDIR} -name config.guess);do \ if [ -f $$i.bak ];then \ mv $$i.bak $$i; \ fi;\ diff --git a/mk/pkg-bottom.mk b/mk/pkg-bottom.mk index bf8ed4ea3..34e5405a8 100644 --- a/mk/pkg-bottom.mk +++ b/mk/pkg-bottom.mk @@ -18,9 +18,9 @@ do-configure: post-configure: ${_CONFIGURE_COOKIE}: ${_PATCH_COOKIE} ifneq (,$(filter autoreconf,${AUTOTOOL_STYLE})) - cd ${WRKSRC}; env ${AUTOTOOL_ENV} autoreconf -if - rm -rf ${WRKSRC}/autom4te.cache - touch ${WRKDIR}/.autoreconf_done + cd ${WRKSRC}; env ${AUTOTOOL_ENV} autoreconf -if $(MAKE_TRACE) + @rm -rf ${WRKSRC}/autom4te.cache + @touch ${WRKDIR}/.autoreconf_done endif mkdir -p ${WRKBUILD} @${MAKE} pre-configure $(MAKE_TRACE) |