diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-03 15:26:25 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-03 15:26:25 +0200 |
| commit | ea5982c66102e854157bea545d8eec79e00ed511 (patch) | |
| tree | 7d2d01a2d0d37e5a979e722975a7942d5d084a3f /mk | |
| parent | 30de1b74c89a3b04176a93d5214aa5186f0a2a75 (diff) | |
| parent | 5f2187e92c8d151b840454282fe390ebad030e35 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/buildhlp.mk | 1 | ||||
| -rw-r--r-- | mk/pkg-bottom.mk | 5 |
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 |