summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorThorsten Glaser <tg@mirbsd.org>2014-05-03 13:23:35 +0000
committerWaldemar Brodkorb <wbx@openadk.org>2014-05-03 15:25:11 +0200
commit5f2187e92c8d151b840454282fe390ebad030e35 (patch)
tree05d6bae9af2967e5b4968bb72c5a53b1b264788a /mk
parente8b64ae830c3b612899c496317329f09ab31e703 (diff)
more flexible list of files to ignore when doing update-patches
e.g. for use with autoconf, but also for build-time generated files that are part of the distfile Signed-off-by: Thorsten Glaser <tg@mirbsd.org>
Diffstat (limited to 'mk')
-rw-r--r--mk/buildhlp.mk1
-rw-r--r--mk/pkg-bottom.mk5
2 files changed, 6 insertions, 0 deletions
diff --git a/mk/buildhlp.mk b/mk/buildhlp.mk
index bf3418b7c..4a3baeaf2 100644
--- a/mk/buildhlp.mk
+++ b/mk/buildhlp.mk
@@ -111,6 +111,7 @@ endif
@WRKDIST=$(call shellescape,${WRKDIST}) \
WRKDIR1=$(call shellescape,${WRKDIR}) \
PATH=$(call shellescape,${HOST_PATH}) \
+ $(call shellexport,DIFF_IGNOREFILES) \
mksh ${TOPDIR}/scripts/update-patches2
.PHONY: update-patches host-update-patches
diff --git a/mk/pkg-bottom.mk b/mk/pkg-bottom.mk
index 2ccc6ff1e..bdc7104c3 100644
--- a/mk/pkg-bottom.mk
+++ b/mk/pkg-bottom.mk
@@ -267,3 +267,8 @@ ifeq (,$(filter noremove,${PKG_OPTS}))
fi
endif
@rm -f '${STAGING_PKG_DIR}/${PKG_NAME}'
+
+ifneq (,$(filter autoreconf,${AUTOTOOL_STYLE}))
+DIFF_IGNOREFILES?= configure missing depcomp install-sh INSTALL \
+ aclocal.m4 config.h.in Makefile.in */Makefile.in
+endif