X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=nucleus%2Fmakefile;h=9a2fd10bcf4158ca2b4b37da232cb27da5945391;hb=refs%2Fheads%2Fmain;hp=5e5c392a300605a0c0dfe6807d64088116799044;hpb=26cc4f3ade8271bd0941c587d4ac21219bac2542;p=feisty_meow.git

diff --git a/nucleus/makefile b/nucleus/makefile
index 5e5c392a..9a2fd10b 100644
--- a/nucleus/makefile
+++ b/nucleus/makefile
@@ -4,50 +4,49 @@ 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
-endif
-ifeq "$(CLAM_DIR)" ""
-  export CLAM_DIR = $(FEISTY_MEOW_SCRIPTS)/clam
+#ifeq "$(PRODUCTION_STORE)" ""
+#  export PRODUCTION_STORE = $(FEISTY_MEOW_APEX)/production
+#endif
+ifeq "$(CLAM_SCRIPTS)" ""
+  export CLAM_SCRIPTS = $(FEISTY_MEOW_SCRIPTS)/clam
 endif
 
-include $(CLAM_DIR)/cpp/variables.def
+include $(CLAM_SCRIPTS)/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
+include $(CLAM_SCRIPTS)/cpp/rules.def
 
-do_make: start_make $(PRODUCTION_DIR)/binaries/manifest.txt end_make
+do_make: start_make $(RUNTIME_PATH)/binaries/manifest.txt end_make
 
 start_make: show_date.start
 
 end_make: show_date.end
 
-$(PRODUCTION_DIR)/binaries/manifest.txt: $(PARAMETER_FILE)
+$(RUNTIME_PATH)/binaries/manifest.txt: $(PARAMETER_FILE)
 	$(HIDESH) -c '\
 if [ ! -d "$(EXECUTABLE_DIR)" ]; then mkdir -p "$(EXECUTABLE_DIR)"; fi; \
 if [ $$? -ne 0 ]; then \
   echo build failure while creating executable directory.; \
   exit 1; \
 fi; \
-cp -f "$(PRODUCTION_DIR)/paths.ini" "$(EXECUTABLE_DIR)"; \
+cp -f "$(PRODUCTION_STORE)/paths.ini" "$(EXECUTABLE_DIR)"; \
 if [ $$? -ne 0 ]; then \
   echo build failure while copying paths initialization file.; \
   exit 1; \
 fi; \
-echo cmd is: $(CLAM_BIN)/value_tagger$(EXE_END) $(PRODUCTION_DIR)/codescan.ini; \
-$(CLAM_BIN)/value_tagger$(EXE_END) $(PRODUCTION_DIR)/codescan.ini; \
+$(CLAM_BINARIES)/value_tagger$(EXE_END) $(PRODUCTION_STORE)/codescan.ini; \
 if [ $$? -ne 0 ]; then \
   echo build failure during value tagging.; \
   exit 1; \
 fi; \
-$(CLAM_BIN)/write_build_config$(EXE_END); \
+$(CLAM_BINARIES)/write_build_config$(EXE_END); \
 if [ $$? -ne 0 ]; then \
   echo build failure while writing config.; \
   exit 1; \