From c1561567f12760489e6c5c29b1e3e03c79dc149d Mon Sep 17 00:00:00 2001
From: ketmar <ketmar@ketmar.no-ip.org>
Date: Mon, 3 Sep 2012 11:39:47 +0300
Subject: [PATCH] some fixes for 'install' target

---
 defaults/Jambase.install | 24 +++++++++++++++++-------
 defaults/Jambase.vars    |  1 -
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/defaults/Jambase.install b/defaults/Jambase.install
index ea89dbf..a63421e 100644
--- a/defaults/Jambase.install
+++ b/defaults/Jambase.install
@@ -1,22 +1,32 @@
+INSTALLGRIST ?= installed ;
+PREFIX ?= /usr/local ;
+#DESTDIR
+
+
 #
 # various install rules
 #
 rule AddSlash {
-  local _ttt = [ Split "$(<[1])" ] ;
-  local _len = [ ListLength $(_ttt) ];
-  if $(_len) != "0" && $(_ttt[$(_len)]) != "/" { _ttt = "$(<[1])/" ; } else { _ttt = $(<[1]) ; }
-  return $(_ttt) ;
+  local _ttt = [ Split $(<[1]:J=/) ] ;
+  local _len = [ ListLength $(_ttt) ] ;
+
+  if $(_len) != "0" && $(_ttt[$(_len)]) != "/" { _ttt += "/" ; }
+  return $(_ttt:J) ;
 }
 
 
 rule InstallDestDir {
   local ddd = [ AddSlash $(DESTDIR) ] ;
   local spl = [ Split $(<) ] ;
-
+  #
   if $(spl[1]) != "/" {
     local ppp = [ AddSlash $(PREFIX) ] ;
-    if ! $(ppp) { ppp = "/usr/local/" ; }
-    if $(ddd) { ppp = $(ddd)$(ppp) ; }
+    #
+    if $(ddd) {
+      spl = [ Split $(ppp) ] ;
+      if $(spl[1]) = "/" { ppp = $(spl[2-]:J) ; }
+      ppp = $(ddd)$(ppp) ;
+    }
     return $(ppp)$(<);
   } else {
     return $(ddd)$(<) ;
diff --git a/defaults/Jambase.vars b/defaults/Jambase.vars
index 129624b..9711960 100644
--- a/defaults/Jambase.vars
+++ b/defaults/Jambase.vars
@@ -192,7 +192,6 @@ DOTDOT      ?= .. ;
 EXEMODE     ?= 755 ;
 FILEMODE    ?= 644 ;
 HDRS        ?= ;
-INSTALLGRIST    ?= installed ;
 JAMFILE     ?= Jamfile ;
 JAMRULES    ?= Jamrules ;
 LEX         ?= ;
-- 
2.11.4.GIT