X-Git-Url: http://git.tdb.fi/?p=libs%2Fcore.git;a=blobdiff_plain;f=Build;h=621857dccd8b2e08ebeded6715ff303df8f4a9d3;hp=cf72f3dc1231a01bda38af29e17adeb8f9fd6c57;hb=32d6e3c59c8ae64e06a5df18b2e7a067a3f2c23a;hpb=bdea0d5d312658f8ca4a52b2c645ed7c6d78c983

diff --git a/Build b/Build
index cf72f3d..621857d 100644
--- a/Build
+++ b/Build
@@ -4,14 +4,14 @@ package "mspcore"
 	description "Mikkosoft Productions core library";
 
 	require "sigc++-2.0";
-	if "arch!=win32"
+	if_arch "!windows"
 	{
 		build_info
 		{
 			library "pthread";
 		};
 	};
-	if "arch=linux"
+	if_arch "linux"
 	{
 		build_info
 		{
@@ -19,48 +19,6 @@ package "mspcore"
 		};
 	};
 
-	headers "msp/core"
-	{
-		source "source/core";
-		install true;
-	};
-
-	headers "msp/time"
-	{
-		source "source/time";
-		install true;
-	};
-
-	headers "msp/debug"
-	{
-		source "source/debug";
-		install true;
-	};
-
-	headers "msp/strings"
-	{
-		source "source/strings";
-		install true;
-	};
-
-	headers "msp/stringcodec"
-	{
-		source "source/stringcodec";
-		install true;
-	};
-
-	headers "msp/io"
-	{
-		source "source/io";
-		install true;
-	};
-
-	headers "msp/fs"
-	{
-		source "source/fs";
-		install true;
-	};
-
 	library "mspcore"
 	{
 		source "source/core";
@@ -71,6 +29,10 @@ package "mspcore"
 		source "source/io";
 		source "source/fs";
 		install true;
+		install_map
+		{
+			map "source" "include/msp";
+		};
 	};
 
 	program "grep"
@@ -109,7 +71,7 @@ package "mspcore"
 		};
 	};
 
-	tarball "@src"
+	source_tarball
 	{
 		source "License.txt";
 		source "source/stringcodec/jisx0208.table";