From aa20beadfbad9d76c7e438e4657a4e7e2a4493d4 Mon Sep 17 00:00:00 2001
From: ketmar <ketmar@ketmar.no-ip.org>
Date: Fri, 27 Jan 2012 21:52:24 +0200
Subject: [PATCH] better SubDir

---
 Jamrules         |  2 +-
 defaults/Jambase | 29 ++++++++++++++++++++++++-----
 2 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/Jamrules b/Jamrules
index af2fca2..820622f 100644
--- a/Jamrules
+++ b/Jamrules
@@ -85,7 +85,7 @@ if $(UNIX) {
 }
 
 
-HDRS += $(ALL_LOCATE_TARGET) ;
+HDRS += $(ALL_LOCATE_TARGET)/src ;
 
 
 actions AShowHelp {
diff --git a/defaults/Jambase b/defaults/Jambase
index 58b722c..b94ea3a 100644
--- a/defaults/Jambase
+++ b/defaults/Jambase
@@ -1627,21 +1627,40 @@ rule SubDir {
   # directory should not hold object files, LOCATE_TARGET can
   # subsequently be redefined.
   SEARCH_SOURCE = $(SUBDIR) ;
-  LOCATE_SOURCE = $(ALL_LOCATE_TARGET) $(SUBDIR) ;
-  LOCATE_TARGET = $(ALL_LOCATE_TARGET) $(SUBDIR) ;
+
+  ktmp = $(ALL_LOCATE_TARGET) ;
+  if $(ALL_LOCATE_TARGET) {
+    LOCATE_TARGET = "$(ALL_LOCATE_TARGET)$(PATH_SEPARATOR)$(SUBDIR)" ;
+    LOCATE_SOURCE = "$(ALL_LOCATE_TARGET)$(PATH_SEPARATOR)$(SUBDIR)" ;
+  } else {
+    LOCATE_TARGET = $(SUBDIR) ;
+    LOCATE_SOURCE = $(SUBDIR) ;
+  }
 
   ktmp = $(ALL_LOCATE_BIN) ;
   if ! $(ktmp) { ktmp = $(ALL_LOCATE_TARGET) ; }
-  LOCATE_BIN = $(ktmp) $(SUBDIR) ;
+  if $(ktmp) {
+    LOCATE_BIN = "$(ktmp)$(PATH_SEPARATOR)$(SUBDIR)" ;
+  } else {
+    LOCATE_BIN = $(SUBDIR) ;
+  }
 
   ktmp = $(ALL_LOCATE_LIB) ;
   if ! $(ktmp) { ktmp = $(ALL_LOCATE_TARGET) ; }
-  LOCATE_LIB = $(ktmp) $(SUBDIR) ;
+  if $(ktmp) {
+    LOCATE_LIB = "$(ktmp)$(PATH_SEPARATOR)$(SUBDIR)" ;
+  } else {
+    LOCATE_LIB = $(SUBDIR) ;
+  }
 
   ktmp = $(ALL_LOCATE_LIBSO) ;
   if ! $(ktmp) { ktmp = $(ALL_LOCATE_LIB) ; }
   if ! $(ktmp) { ktmp = $(ALL_LOCATE_TARGET) ; }
-  LOCATE_LIBSO = $(ktmp) $(SUBDIR) ;
+  if $(ktmp) {
+    LOCATE_LIBSO = "$(ktmp)$(PATH_SEPARATOR)$(SUBDIR)" ;
+  } else {
+    LOCATE_LIBSO = $(SUBDIR) ;
+  }
 
   SOURCE_GRIST = [ FGrist $(SUBDIR_TOKENS) ] ;
   #if ! $(LOCATE_BIN) { LOCATE_BIN = $(LOCATE_TARGET) ; }
-- 
2.11.4.GIT