diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2009-12-29 18:43:00 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2009-12-29 18:43:00 +0100 |
| commit | 7a545ad720f1f8823d6e3dd0e51e1fa9dff237b1 (patch) | |
| tree | 16083a85aca4e3a621b3db881c89331262d62045 /mk | |
| parent | 7805532fffa81c46a01af77aa967cf11a948a9f1 (diff) | |
| parent | c6fa1f863aedbdbc977c78e1dc62ca5eb0da9451 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/build.mk | 1 | ||||
| -rw-r--r-- | mk/pkg-bottom.mk | 6 |
2 files changed, 5 insertions, 2 deletions
diff --git a/mk/build.mk b/mk/build.mk index e8309afba..1a9c637cf 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -13,6 +13,7 @@ CONFIG = config DEFCONFIG= ADK_DEVELSYSTEM=n \ ADK_DEBUG=n \ ADK_STATIC=n \ + ADK_MAKE_PARALLEL=n \ ADK_FORCE_PARALLEL=n \ ADK_PACKAGE_GRUB=n \ ADK_PACKAGE_BASE_FILES=y \ diff --git a/mk/pkg-bottom.mk b/mk/pkg-bottom.mk index 3a7320d6e..a3ca4590c 100644 --- a/mk/pkg-bottom.mk +++ b/mk/pkg-bottom.mk @@ -20,11 +20,13 @@ ${_CONFIGURE_COOKIE}: ${_PATCH_COOKIE} ifneq ($(filter autotool,${CONFIGURE_STYLE}),) cd ${WRKBUILD}; \ - autoreconf -vif $(MAKE_TRACE) + env AUTOCONF_VERSION=2.62 \ + AUTOMAKE_VERSION=1.9 \ + autoreconf -vif $(MAKE_TRACE) endif ifneq ($(filter autoconf,${CONFIGURE_STYLE}),) cd ${WRKBUILD}; \ - autoconf $(MAKE_TRACE) + env AUTOCONF_VERSION=2.62 autoconf $(MAKE_TRACE) endif ifneq ($(filter gnu,${CONFIGURE_STYLE}),) @$(CMD_TRACE) "configuring... " |