X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Fclam%2Fvariables.def;h=6acd205616d969ea95c8b3a26b2aeab7b880ca7b;hb=d87617f212d9dff8d5033b81e19a0740846999fe;hp=6bf3d2ca0da71db6f4e80b971ab14ed4c5fcf156;hpb=ab14c2f4301aa8b545086045ecc8a53cf66109de;p=feisty_meow.git

diff --git a/scripts/clam/variables.def b/scripts/clam/variables.def
index 6bf3d2ca..6acd2056 100644
--- a/scripts/clam/variables.def
+++ b/scripts/clam/variables.def
@@ -61,13 +61,13 @@ endif
 
 ###############################################################################
 
-# "FEISTY_MEOW_DIR" is the root of the "build" for our compilation oriented
+# "FEISTY_MEOW_APEX" is the root of the "build" for our compilation oriented
 # features.  All source code and build helper files are usually found there.
 # The build targets to be built are usually stored there also, although the
 # targets can be located elsewhere if desired.  see TARGETS_DIR below.
-export FEISTY_MEOW_DIR
-ifeq "$(FEISTY_MEOW_DIR)" ""
-#  FEISTY_MEOW_DIR = 
+export FEISTY_MEOW_APEX
+ifeq "$(FEISTY_MEOW_APEX)" ""
+#  FEISTY_MEOW_APEX = 
 #uhhh, use the current location?
 #currently we rely on this being set from shell bootstrapping.  is that bad?
 endif
@@ -76,14 +76,15 @@ endif
 # be able to find a few things there reliably.
 export FEISTY_MEOW_SCRIPTS
 ifeq "$(FEISTY_MEOW_SCRIPTS)" ""
-  export FEISTY_MEOW_SCRIPTS := $(FEISTY_MEOW_DIR)/scripts
+  export FEISTY_MEOW_SCRIPTS := $(FEISTY_MEOW_APEX)/scripts
 endif
 
-# "PRODUCTION_DIR" is where the built products will be stored, plus any
-# temporary files that are generated during the build.
+# "PRODUCTION_DIR" is where components required for building the code or
+# installers can be found.
+#hmmm: is this redundant?
 export PRODUCTION_DIR
 ifeq "$(PRODUCTION_DIR)" ""
-  PRODUCTION_DIR=$(FEISTY_MEOW_DIR)/production
+  PRODUCTION_DIR=$(FEISTY_MEOW_APEX)/production
 endif
 
 # "CLAM_DIR" points at where the CLAM source files are located.  this is needed
@@ -101,12 +102,9 @@ export TARGETS_DIR
 ifeq "$(TARGETS_DIR)" ""
   # the default is to generate files into subdirectories that are at the
   # top-level of the repository.
-  TARGETS_DIR = $(FEISTY_MEOW_DIR)
+  TARGETS_DIR = $(FEISTY_MEOW_APEX)
 endif
 
-# "CLAM_BIN" points at the location for helper binaries and shell scripts.
-export CLAM_BIN = $(PRODUCTION_DIR)/clam_bin
-
 # "CURRENT_DIR" is the directory where this make was started.
 export CURRENT_DIR := $(shell pwd)
 
@@ -189,26 +187,32 @@ include $(PARAMETER_FILE)
 
 ############################################################################
 
-# "CLEAN" is an powerful flag that affects what clam does.  if the flag is
+# "CLEAN" is a powerful flag that affects what clam does.  if the flag is
 # non-empty, then nothing will be built and every generated file that is
-# known about will be deleted.
+# known about will be deleted.  it is intended as exported, since then sub-
+# shells know that they are cleaning and we do not have to pass them a
+# target.
+#hmmm: (although we do?)
 export CLEAN
 # "CLEANUPS" are things to be removed by the "make clean" command.
-#CLEANUPS =
+undefine CLEANUPS
 # OTHER_CLEANS are targets to execute before performing the main clean up.
-#OTHER_CLEANS =
+# we intentionally reset this here to avoid a polluted variable getting
+# to us from a previous make.
+undefine OTHER_CLEANS
 
 # sets the temporary directory.
 export CLAM_TMP
 ifeq "$(CLAM_TMP)" ""
-  CLAM_TMP := $(WASTE_DIR)
+  CLAM_TMP := $(GENERATED_DIR)/clam_tmp
 endif
 
-ifeq "$(OP_SYSTEM)" "WIN32"
-  # set these so that compilers and such will use them.
-  export TMP := $(CLAM_TMP)
-  export TEMP := $(CLAM_TMP)
-endif
+#turned off for the moment, since this seems like a bad idea; we define clam tmp in terms of tmp sometimes, don't we???
+#ifeq "$(OP_SYSTEM)" "WIN32"
+#  # set these so that compilers and such will use them.
+#  export TMP := $(CLAM_TMP)
+#  export TEMP := $(CLAM_TMP)
+#endif
 
 # "FAILURE_FILE" is a file that is used as a flag to track failures.  if the
 # file exists, then it is assumed that a failure happened during the current