prefix style of installation

1 files changed, 12 insertions, 15 deletions

diff --git a/Jamroot b/Jamroot
index a62296101..0c6665d20 100644
--- a/Jamroot
+++ b/Jamroot
@@ -21,9 +21,11 @@
 #
 #
 #INSTALLATION
-#--install=/path/to/install sets the install directory (default dist).
+#--prefix=/path/to/prefix sets the install prefix [dist].
+#--bindir=/path/to/prefix/bin sets the bin directory [PREFIX/bin]
+#--libdir=/path/to/prefix/lib sets the lib directory [PREFIX/lib]
 #--install-scripts=/path/to/scripts copies scripts into a directory.
-#--git appends the git revision to the install directory name.
+#--git appends the git revision to the prefix directory.
 #
 #
 #BUILD OPTIONS
@@ -180,20 +182,15 @@ install-location = [ option.get "install" : $(TOP)/dist ] ;
 
 if [ option.get "git" : : "yes" ] {
   local revision = [ _shell "git rev-parse --verify HEAD |head -c 7" ] ;
-  constant GITTAG : "."$(revision) ;
+  constant GITTAG : "/"$(revision) ;
 } else {
   constant GITTAG : "" ;
 }
 
-install-location = $(install-location)$(GITTAG) ;
-
-install dist : 
-  lm//query
-  lm//build_binary
-  moses-chart-cmd/src//moses_chart 
-  moses-cmd/src//programs
-  CreateOnDisk/src//CreateOnDisk
-  mert//programs
-  contrib/server//mosesserver
-  misc//programs
-  : <location>$(install-location) <install-type>EXE <install-dependencies>on <link>shared:<dll-path>$(install-location) <link>shared:<install-type>LIB ;
+alias programs : lm//query lm//build_binary moses-chart-cmd/src//moses_chart moses-cmd/src//programs CreateOnDisk/src//CreateOnDisk mert//programs contrib/server//mosesserver misc//programs ;
+
+prefix = [ option.get "prefix" : $(TOP)/dist$(GITTAG) ] ;
+bindir = [ option.get "bindir" : $(prefix)/bin ] ;
+libdir = [ option.get "libdir" : $(prefix)/lib ] ;
+install prefix-bin : programs : <location>$(bindir) <install-dependencies>on <install-type>EXE <link>shared:<dll-path>$(libdir) ;
+install prefix-lib : programs : <location>$(libdir) <install-dependencies>on <install-type>LIB <link>shared:<dll-path>$(libdir) ;