New standard ice install path

5 files changed, 8 insertions, 7 deletions

diff --git a/slicer/db/Jamfile.jam b/slicer/db/Jamfile.jam
index 2e5c69f..73c05e5 100644
--- a/slicer/db/Jamfile.jam
+++ b/slicer/db/Jamfile.jam
@@ -17,6 +17,7 @@ lib slicer-db :
 	<library>../slicer//slicer
 	<implicit-dependency>../slicer//slicer
 	<implicit-dependency>sqlExceptions
+	<dependency>../slicer//install-headers-local
 	: :
 	<library>dbppcore
 	<implicit-dependency>sqlExceptions
@@ -141,5 +142,5 @@ explicit install ;
 explicit install-lib ;
 explicit install-slice ;
 package.install install-lib : <install-header-subdir>slicer/db : : slicer-db : [ glob-tree *.h : test*.h ] ;
-package.install-data install-slice : slicer/ice : [ glob *.ice : test*.ice ] ;
+package.install-data install-slice : ice/slicer/db : [ glob *.ice : test*.ice ] ;
 
diff --git a/slicer/ice/Jamfile.jam b/slicer/ice/Jamfile.jam
index 79cfaba..1330c9f 100644
--- a/slicer/ice/Jamfile.jam
+++ b/slicer/ice/Jamfile.jam
@@ -10,6 +10,7 @@ lib slicer-ice :
 	<library>..//adhocutil
 	<library>../slicer//slicer
 	<implicit-dependency>../slicer//slicer
+	<dependency>../slicer//install-headers-local
 	: :
 	;
 
@@ -26,10 +27,8 @@ run testSpecifics.cpp
 	testSpecifics
 	;
 
-alias install : install-lib install-slice ;
+alias install : install-lib ;
 explicit install ;
 explicit install-lib ;
-explicit install-slice ;
 package.install install-lib : <install-header-subdir>slicer/ice : : slicer-ice : [ glob-tree *.h ] ;
-package.install-data install-slice : slicer/ice : [ glob *.ice ] ;
 
diff --git a/slicer/json/Jamfile.jam b/slicer/json/Jamfile.jam
index 8c533bb..cc962fe 100644
--- a/slicer/json/Jamfile.jam
+++ b/slicer/json/Jamfile.jam
@@ -14,6 +14,7 @@ lib slicer-json :
 	<library>../..//glibmm
 	<library>..//adhocutil
 	<library>../slicer//slicer
+	<dependency>../slicer//install-headers-local
 	: :
 	<library>jsonpp
 	;
diff --git a/slicer/slicer/Jamfile.jam b/slicer/slicer/Jamfile.jam
index aa593e3..092fd52 100644
--- a/slicer/slicer/Jamfile.jam
+++ b/slicer/slicer/Jamfile.jam
@@ -21,7 +21,6 @@ lib slicer :
 	<implicit-dependency>common
 	<library>stdc++fs
 	<include>bin/include
-	<dependency>../slicer//install-headers-local
 	;
 
 alias install : install-lib install-slice ;
@@ -29,7 +28,7 @@ explicit install ;
 explicit install-lib ;
 explicit install-slice ;
 package.install install-lib : <install-header-subdir>slicer/slicer : : slicer : [ glob-tree-ex . : *.h : include ] ;
-package.install-data install-slice : slicer/ice : [ glob *.ice ] ;
+package.install-data install-slice : ice/slicer/slicer : [ glob *.ice ] ;
 
 explicit install-headers-local ;
 install install-headers-local : common : <location>bin/include/slicer ;
diff --git a/slicer/xml/Jamfile.jam b/slicer/xml/Jamfile.jam
index d227b83..390b449 100644
--- a/slicer/xml/Jamfile.jam
+++ b/slicer/xml/Jamfile.jam
@@ -14,6 +14,7 @@ lib slicer-xml :
 	<library>../slicer//slicer
 	<implicit-dependency>../slicer//slicer
 	<implicit-dependency>xmlExceptions
+	<dependency>../slicer//install-headers-local
 	: :
 	<library>../..//libxmlpp
 	<implicit-dependency>xmlExceptions
@@ -40,5 +41,5 @@ explicit install ;
 explicit install-lib ;
 explicit install-slice ;
 package.install install-lib : <install-header-subdir>slicer/xml : : slicer-xml : [ glob-tree *.h ] ;
-package.install-data install-slice : slicer/ice : [ glob *.ice ] ;
+package.install-data install-slice : ice/slicer/xml : [ glob *.ice ] ;