Match package config. variables with their directory names

[openwrt.git] / Makefile

diff --git a/Makefile b/Makefile
index ef60ff1..cd94233 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,11 @@
 #--------------------------------------------------------------
 TOPDIR=${shell pwd}
 export TOPDIR
+ifneq ($(DEVELOPER),)
+CONFIG_CONFIG_IN = Config.in.devel
+else
 CONFIG_CONFIG_IN = Config.in
+endif
 CONFIG_DEFCONFIG = .defconfig
 CONFIG = package/config
 
@@ -41,6 +45,8 @@ include $(TOPDIR)/rules.mk
 
 all: world
 
+.NOTPARALLEL:
+
 ##############################################################
 #
 # Build the toolchain
@@ -55,8 +61,11 @@ toolchain_install:
 #
 ##############################################################
 
-package_install: toolchain
-       $(MAKE) -C package compile install
+package_compile: target_compile
+       $(MAKE) -C package compile
+
+package_install: package_compile toolchain
+       $(MAKE) -C package install
 
 #############################################################
 #
@@ -85,6 +94,9 @@ package_index:
 target_prepare:
        $(MAKE) -C target prepare
 
+target_compile:
+       $(MAKE) -C target compile
+
 target_install:
        $(MAKE) -C target install
 
@@ -116,7 +128,7 @@ dirclean: clean
        rm -rf $(BUILD_DIR)
 
 distclean: clean
-       rm -rf $(STAMP_DIR) $(DL_DIR) $(BUILD_DIR) $(TOOL_BUILD_DIR)
+       rm -rf $(STAMP_DIR) $(DL_DIR) $(BUILD_DIR) $(TOOL_BUILD_DIR) $(STAGING_DIR)
        rm -f .config* .tmpconfig.h
 
 sourceball: distclean