X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Fclam%2Fvariables.def;h=594b57f34c3212f2b55443264dcd9c064f60b672;hb=b51411a29f1a751a09e69f5676afeea24a94ac83;hp=1373c7ebd194a1098a1e7cda186a153bbf5d01ed;hpb=2952ccf47b80174880141a7ecfa122089f349b8d;p=feisty_meow.git

diff --git a/scripts/clam/variables.def b/scripts/clam/variables.def
index 1373c7eb..594b57f3 100644
--- a/scripts/clam/variables.def
+++ b/scripts/clam/variables.def
@@ -61,22 +61,38 @@ endif
 
 ###############################################################################
 
-# "REPOSITORY_DIR" is the root of the "build" for our compilation oriented
+# "FEISTY_MEOW_DIR" 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 REPOSITORY_DIR
-ifeq "$(REPOSITORY_DIR)" ""
-#  REPOSITORY_DIR = 
+export FEISTY_MEOW_DIR
+ifeq "$(FEISTY_MEOW_DIR)" ""
+#  FEISTY_MEOW_DIR = 
 #uhhh, use the current location?
+#currently we rely on this being set from shell bootstrapping.  is that bad?
+endif
+
+# "FEISTY_MEOW_SCRIPTS" is the root location of our scripts.  we expect to
+# 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
+endif
+
+# "PRODUCTION_DIR" is where the built products will be stored, plus any
+# temporary files that are generated during the build.
+export PRODUCTION_DIR
+ifeq "$(PRODUCTION_DIR)" ""
+  PRODUCTION_DIR=$(FEISTY_MEOW_DIR)/production
 endif
 
 # "CLAM_DIR" points at where the CLAM source files are located.  this is needed
 # for finding shell scripts used during compilation.  if you are not using the
 # standard CLAM location, then modify this appropriately.
 export CLAM_DIR
-# must be set externally!
-#export CLAM_DIR := $(SHELLDIR)/clam
+ifeq "$(CLAM_DIR)" ""
+  export CLAM_DIR := $(FEISTY_MEOW_SCRIPTS)/clam
+endif
 
 # "TARGETS_DIR" is where all generated files will end up.  Usually the
 # files are put in a subdirectory named after their file type, such as
@@ -85,13 +101,11 @@ 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 = $(REPOSITORY_DIR)
+  TARGETS_DIR = $(FEISTY_MEOW_DIR)
 endif
 
 # "CLAM_BIN" points at the location for helper binaries and shell scripts.
-ifeq "$(OP_SYSTEM)" "UNIX"
-  export CLAM_BIN = $(PRODUCTION_DIR)/clam_bin
-endif
+export CLAM_BIN = $(PRODUCTION_DIR)/clam_bin
 
 # "CURRENT_DIR" is the directory where this make was started.
 export CURRENT_DIR := $(shell pwd)
@@ -153,9 +167,6 @@ export MAKEFILE_NAME = makefile
 # find command.  on dosdows, the find command is utter garbage and we need
 # to make sure we don't accidentally run that inferior one.
 export FIND = find
-#ifeq "$(OP_SYSTEM)" "WIN32"
-#  export FIND = $(REPOSITORY_DIR)/msys/bin/find
-#endif
 
 # "PARAMETER_FILE" is the location of our version stamps (if defined) and
 # also contains any extra flags passed to the compilation.