slightly closer but cleanups are still wrong.

[feisty_meow.git] / nucleus / makefile

diff --git a/nucleus/makefile b/nucleus/makefile
index d389997243298c9c3a854c2b724e5f6d170fd69a..4f931027dfef143c96e4ebb1cbfd4d77ffe10063 100644 (file)
--- a/nucleus/makefile
+++ b/nucleus/makefile
@@ -4,11 +4,11 @@ include variables.def
 
 # Set default locations for the following variables.  If the build_variables
 # have been sourced in, that takes care of setting these.
-ifeq "$(FEISTY_MEOW_DIR)" ""
-  export FEISTY_MEOW_DIR := $(CURRENT_DIR)
+ifeq "$(FEISTY_MEOW_APEX)" ""
+  export FEISTY_MEOW_APEX := $(CURRENT_DIR)
 endif
 #ifeq "$(PRODUCTION_DIR)" ""
-#  export PRODUCTION_DIR = $(FEISTY_MEOW_DIR)/production
+#  export PRODUCTION_DIR = $(FEISTY_MEOW_APEX)/production
 #endif
 ifeq "$(CLAM_DIR)" ""
   export CLAM_DIR = $(FEISTY_MEOW_SCRIPTS)/clam
@@ -18,7 +18,7 @@ include $(CLAM_DIR)/cpp/variables.def
 
 PROJECT = feisty_meow_nucleus
 TYPE = hierarchy
-FIRST_TARGETS = do_make
+FIRST_TARGETS += do_make
 BUILD_AFTER = library applications tools
 
 include $(CLAM_DIR)/cpp/rules.def