diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2013-10-31 18:01:03 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2013-10-31 18:01:03 +0100 |
| commit | d4b446db89ba29b844b1f05dc112bc8d5c573f4b (patch) | |
| tree | 0f6bf55bd6514157374c11016fc537dfc6114a77 /mk/buildhlp.mk | |
| parent | 1c2328a04fd17ddb2009d2f94ec075c7180e4ef5 (diff) | |
| parent | c37b25dfca1079115418200bf39faa00b8e14012 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'mk/buildhlp.mk')
| -rw-r--r-- | mk/buildhlp.mk | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/mk/buildhlp.mk b/mk/buildhlp.mk index 8b6a4a8c8..587a97125 100644 --- a/mk/buildhlp.mk +++ b/mk/buildhlp.mk @@ -93,17 +93,18 @@ ifeq ($(strip ${_IN_PACKAGE})$(strip ${_IN_CVTC}),1) else @$(MAKE) -s V=0 prepare WRKDIR=${WRKDIR}.orig PREVENT_PATCH=: NO_CHECKSUM=1 endif - @-test -r ${WRKDIR}/.autoreconf_done && \ - (cd ${WRKDIR}.orig/${PKG_NAME}-${PKG_VERSION}; \ - env ${AUTOTOOL_ENV} autoreconf -if) - @rm -rf ${WRKDIR}.orig/${PKG_NAME}-${PKG_VERSION}/autom4te.cache + @-test ! -r ${WRKDIR}/.autoreconf_done || \ + (wrkdist=$(WRKDIST) dir=$${wrkdist#$(WRKDIR)}; \ + cd ${WRKDIR}.orig$${dir}; \ + env ${AUTOTOOL_ENV} autoreconf -if; \ + rm -rf ${WRKDIR}.orig$${dir}/autom4te.cache ) $(MAKE_TRACE) @# 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;\ |