summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2013-10-30 14:46:44 (GMT)
committerWaldemar Brodkorb <wbx@openadk.org>2013-10-30 14:46:44 (GMT)
commit5ce633839096d25a684af6978ba9da7d6d34fdaf (patch)
tree2379b5712847a7b6d5f50c8850a21757512db336
parentd9692a11d574a39deaf6f171dcfae7aa0d4a63d4 (diff)
fix update-patches when WRKDIST is overwritten in the Makefile
-rw-r--r--mk/buildhlp.mk3
-rw-r--r--scripts/update-patches5
2 files changed, 7 insertions, 1 deletions
diff --git a/mk/buildhlp.mk b/mk/buildhlp.mk
index 5fdc701..79014ac 100644
--- a/mk/buildhlp.mk
+++ b/mk/buildhlp.mk
@@ -94,7 +94,8 @@ 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}; \
+ (wrkdist=$(WRKDIST) dir=$${wrkdist#$(WRKDIR)}; \
+ cd ${WRKDIR}.orig$${dir}; \
env ${AUTOTOOL_ENV} autoreconf -if) $(MAKE_TRACE)
@rm -rf ${WRKDIR}.orig/${PKG_NAME}-${PKG_VERSION}/autom4te.cache
@# restore config.sub/config.guess
diff --git a/scripts/update-patches b/scripts/update-patches
index a180b96..f4303f8 100644
--- a/scripts/update-patches
+++ b/scripts/update-patches
@@ -91,6 +91,11 @@ for file in $(cd ${WRKDIST}; find . -type f | sed 's#^\./##'); do
echo "DEBUG: $file" >> /tmp/debug
[[ ! -e $ORGDIST/$file && $patch_newfiles = 0 ]] && continue
[[ $file = configure && $ignore_autoconf = 1 ]] && continue
+ [[ $file = missing && $ignore_autoconf = 1 ]] && continue
+ [[ $file = depcomp && $ignore_autoconf = 1 ]] && continue
+ [[ $file = install-sh && $ignore_autoconf = 1 ]] && continue
+ [[ $file = aclocal.m4 && $ignore_autoconf = 1 ]] && continue
+ [[ $file = INSTALL && $ignore_autoconf = 1 ]] && continue
[[ $file = config.h.in && $ignore_autoconf = 1 ]] && continue
[[ $(basename $file) = Makefile.in && $ignore_autoconf = 1 ]] && continue
cmp -s "$ORGDIST/$file" "$WRKDIST/$file" && continue