trying out cleaner look for branchy

[feisty_meow.git] / scripts / clam / cpp / rules.def

diff --git a/scripts/clam/cpp/rules.def b/scripts/clam/cpp/rules.def
index 051d23f028aff6182b6f22fe77cbbae874774b75..87d3bfe49dd55b2a4d9ebc82a3d36927a352a369 100644 (file)
--- a/scripts/clam/cpp/rules.def
+++ b/scripts/clam/cpp/rules.def
@@ -84,10 +84,9 @@ endif
 ###############################################################################
 
 ifeq "$(CLAM_COMPILER)" "GNU_DARWIN"
-
   # finds the crypto code on macos.
-#  HEADER_SEARCH_PATH += /usr/local/opt/openssl/include
-#  LIBRARY_SEARCH_PATH += /usr/local/opt/openssl/lib/
+  HEADER_SEARCH_PATH += /usr/local/opt/openssl/include
+  LIBRARY_SEARCH_PATH += /usr/local/opt/openssl/lib/
 endif
 
 ###############################################################################
@@ -115,8 +114,7 @@ OBJECTS = $(TEMP_OBJ4)
 ACTUAL_OBJECTS = $(OBJECTS) $(EXTRA_OBJECTS)
 
 # Updates the search path for the compiler and local libraries.
-BASE_HEADER_PATH := $(CODEBASE_HEADERS) $(LOCAL_HEADERS) bork1 $(FEISTY_MEOW_CPP_HEADERS) bork2 $(SEARCH_DIRS)
-
+BASE_HEADER_PATH = $(CODEBASE_HEADERS) $(LOCAL_HEADERS) $(strip $(FEISTY_MEOW_CPP_HEADERS)) $(SEARCH_DIRS) 
 HEADER_SEARCH_PATH += $(BASE_HEADER_PATH) $(COMPILER_HEADER_DIR)
 
 LIBRARY_SEARCH_PATH += $(LOCAL_LIBRARIES) $(HOOPLE_LIBRARIES) \