From 89192ea453b664cabb05b0a3037269bf02c3fae2 Mon Sep 17 00:00:00 2001
From: Thorsten Glaser <tg@mirbsd.org>
Date: Sun, 20 Dec 2009 15:29:27 +0059
Subject: introduce pkgmaker into the build at (I hope) all right places

Signed-off-by: Thorsten Glaser <tg@mirbsd.org>
---
 mk/build.mk | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

(limited to 'mk')

diff --git a/mk/build.mk b/mk/build.mk
index f70d40cb1..781da5f41 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -227,7 +227,7 @@ $(CONFIG)/conf:
 $(CONFIG)/mconf:
 	@$(MAKE) -C $(CONFIG)
 
-defconfig:
+defconfig: _menu
 ifeq (${OStype},Linux)
 	@echo ADK_HOST_LINUX=y > $(TOPDIR)/.defconfig
 endif
@@ -318,21 +318,21 @@ ifneq (,$(filter rb%,${TARGET}))
 	@echo ADK_LINUX_MIKROTIK=y >> $(TOPDIR)/all.config
 endif
 
-menuconfig: $(CONFIG)/mconf defconfig
+menuconfig: $(CONFIG)/mconf defconfig _menu
 	@if [ ! -f .config ];then \
 		$(CONFIG)/conf -D .defconfig $(CONFIG_CONFIG_IN); \
 	fi
 	@$(CONFIG)/mconf $(CONFIG_CONFIG_IN)
 	${POSTCONFIG}
 
-_config: $(CONFIG)/conf
+_config: $(CONFIG)/conf _menu
 	-@touch .config
 	@$(CONFIG)/conf ${W} $(CONFIG_CONFIG_IN) >/dev/null
 	${POSTCONFIG}
 
 .NOTPARALLEL: _mconfig
 _mconfig: ${CONFIG}/conf _mconfig2 _config
-_mconfig2: ${CONFIG}/conf modconfig
+_mconfig2: ${CONFIG}/conf modconfig _menu
 	@${CONFIG}/conf -m ${RCONFIG} >/dev/null
 
 # build all targets and combinations
@@ -342,7 +342,7 @@ bulk:
 	$(MAKE) v
 	$(CP) $(BIN_DIR) $(TOPDIR)/bulk
 	$(MAKE) cleantarget
-	
+
 distclean:
 	@$(MAKE) -C $(CONFIG) clean
 	@rm -rf $(BUILD_DIR) $(TOOLS_BUILD_DIR) $(BIN_DIR) $(DISTDIR) \
@@ -353,6 +353,5 @@ distclean:
 
 endif # ifeq ($(strip $(ADK_HAVE_DOT_CONFIG)),y)
 
-menu:
+_menu: .PHONY
 	mksh $(TOPDIR)/package/pkgmaker
-
-- 
cgit v1.2.3