summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorwaldemar brodkorb <wbx@debian-lenny-amd64.foo.bar>2010-01-19 21:14:16 +0100
committerwaldemar brodkorb <wbx@debian-lenny-amd64.foo.bar>2010-01-19 21:14:16 +0100
commitdd181acc1ac0c1e7dc9db85da30bd8522a95773d (patch)
tree08396068cfd74178f725d4b096a321d54ae8a53e /mk
parentfc4027a2b4f5a9384e8552b8dd515e53aae9444c (diff)
parenta903c4fefdc19bb838e808146c6aa1a32296e4cb (diff)
Merge branch 'master' of git+ssh://wbx@openadk.org/git/openadk
Diffstat (limited to 'mk')
-rw-r--r--mk/build.mk5
-rw-r--r--mk/modules.mk1
-rw-r--r--mk/pkg-bottom.mk4
3 files changed, 8 insertions, 2 deletions
diff --git a/mk/build.mk b/mk/build.mk
index 0b5bd0b20..798b0a762 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -428,4 +428,7 @@ bulk:
mksh $(TOPDIR)/package/pkgmaker
@:>.menu
-.PHONY: menu
+dep:
+ mksh $(TOPDIR)/package/depmaker
+
+.PHONY: menu dep
diff --git a/mk/modules.mk b/mk/modules.mk
index e42029271..c208b80a7 100644
--- a/mk/modules.mk
+++ b/mk/modules.mk
@@ -768,7 +768,6 @@ $(eval $(call KMOD_template,CRYPTO_FCRYPT,crypto-fcrypt,\
,11))
$(eval $(call KMOD_template,CRYPTO_DEFLATE,crypto-deflate,\
- $(MODULES_DIR)/kernel/lib/zlib_inflate/zlib_inflate \
$(MODULES_DIR)/kernel/lib/zlib_deflate/zlib_deflate \
$(MODULES_DIR)/kernel/crypto/deflate \
,10))
diff --git a/mk/pkg-bottom.mk b/mk/pkg-bottom.mk
index a3ca4590c..0dc830b28 100644
--- a/mk/pkg-bottom.mk
+++ b/mk/pkg-bottom.mk
@@ -18,6 +18,10 @@ ${_CONFIGURE_COOKIE}: ${_PATCH_COOKIE}
mkdir -p ${WRKBUILD}
@${MAKE} pre-configure $(MAKE_TRACE)
+ifneq ($(filter autogen,${CONFIGURE_STYLE}),)
+ cd ${WRKBUILD}; \
+ ./autogen.sh $(MAKE_TRACE)
+endif
ifneq ($(filter autotool,${CONFIGURE_STYLE}),)
cd ${WRKBUILD}; \
env AUTOCONF_VERSION=2.62 \