diff options
| -rw-r--r-- | mk/buildhlp.mk | 3 | ||||
| -rw-r--r-- | scripts/update-patches | 5 |
2 files changed, 7 insertions, 1 deletions
diff --git a/mk/buildhlp.mk b/mk/buildhlp.mk index 5fdc7011a..79014ac4b 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 a180b96be..f4303f841 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 |