Wasn't exporting the plat headers; refactor to make this a little cleaner.

lang/basic/lib/build.lua

@@ -11,7 +11,7 @@ for _, plat in ipairs(vars.plats) do
 		deps = {
 			"h+emheaders",
 			"lang/cem/libcc.ansi/headers+headers",
-			"plat/"..plat.."+headers",
+			"plat/"..plat.."/include+headers",
 		},
         vars = { plat = plat }
     }

lang/cem/libcc.ansi/build.lua

@@ -52,7 +52,7 @@ for _, plat in ipairs(vars.plats) do
 		hdrs = {}, -- must be empty
 		deps = {
 			"lang/cem/libcc.ansi/headers+headers",
-			"plat/"..plat.."+headers",
+			"plat/"..plat.."/include+headers",
 		},
         vars = { plat = plat }
     }

lang/m2/libm2/build.lua

@@ -30,7 +30,7 @@ for _, plat in ipairs(vars.plats) do
 		hdrs = {}, -- must be empty
 		deps = {
 			"lang/cem/libcc.ansi/headers+headers",
-			"plat/"..plat.."+headers",
+			"plat/"..plat.."/include+headers",
 			"h+emheaders",
 		},
         vars = { plat = plat }

lang/pc/libpc/build.lua

@@ -19,7 +19,7 @@ for _, plat in ipairs(vars.plats) do
 		hdrs = {}, -- must be empty
 		deps = {
 			"lang/cem/libcc.ansi/headers+headers",
-			"plat/"..plat.."+headers",
+			"plat/"..plat.."/include+headers",
 			"h+emheaders",
 		},
         vars = { plat = plat }

plat/cpm/build-headers.lua

@@ -1,11 +0,0 @@
-include("plat/build.lua")
-
-acklibrary {
-	name = "headers",
-	hdrs = {
-		["ack/config.h"] = "./include/ack/config.h",
-		["unistd.h"] = "./include/unistd.h",
-		["cpm.h"] = "./include/cpm.h",
-	}
-}
-

plat/cpm/build-pkg.lua

@@ -18,6 +18,7 @@ installable {
 	map = {
 		"+tools",
 		"+libs",
+        "./include+pkg",
 		["$(PLATIND)/cpm/boot.o"] = "+boot"
 	}
 }

plat/cpm/include/build.lua

@@ -0,0 +1,25 @@
+include("plat/build.lua")
+
+headermap = {}
+packagemap = {}
+
+local function addheader(h)
+	headermap[h] = "./"..h
+	packagemap["$(PLATIND)/cpm/include/"..h] = "./"..h
+end
+
+addheader("ack/config.h")
+addheader("cpm.h")
+addheader("unistd.h")
+
+acklibrary {
+	name = "headers",
+	hdrs = headermap
+}
+
+installable {
+	name = "pkg",
+	map = packagemap
+}
+
+

plat/linux386/build-headers.lua

@@ -1,11 +0,0 @@
-include("plat/build.lua")
-
-acklibrary {
-	name = "headers",
-	hdrs = {
-		["ack/config.h"] = "./include/ack/config.h",
-		["sys/ioctl.h"] = "./include/sys/ioctl.h",
-		["unistd.h"] = "./include/unistd.h",
-	}
-}
-

plat/linux386/build-pkg.lua

@@ -17,6 +17,7 @@ installable {
 	map = {
 		"+tools",
 		"+libs",
+		"./include+pkg",
 		["$(PLATIND)/linux386/boot.o"] = "+boot"
 	}
 }

plat/linux386/include/build.lua

@@ -0,0 +1,24 @@
+include("plat/build.lua")
+
+headermap = {}
+packagemap = {}
+
+local function addheader(h)
+	headermap[h] = "./"..h
+	packagemap["$(PLATIND)/linux386/include/"..h] = "./"..h
+end
+
+addheader("ack/config.h")
+addheader("sys/ioctl.h")
+addheader("unistd.h")
+
+acklibrary {
+	name = "headers",
+	hdrs = headermap
+}
+
+installable {
+	name = "pkg",
+	map = packagemap
+}
+

plat/pc86/build-headers.lua

@@ -1,10 +0,0 @@
-include("plat/build.lua")
-
-acklibrary {
-	name = "headers",
-	hdrs = {
-		["ack/config.h"] = "./include/ack/config.h",
-		["unistd.h"] = "./include/unistd.h",
-	}
-}
-

plat/pc86/build-pkg.lua

@@ -17,6 +17,7 @@ installable {
 	map = {
 		"+tools",
 		"+libs",
+        "./include+pkg",
 		["$(PLATIND)/pc86/boot.o"] = "+boot"
 	}
 }

plat/pc86/include/build.lua

@@ -0,0 +1,24 @@
+include("plat/build.lua")
+
+headermap = {}
+packagemap = {}
+
+local function addheader(h)
+	headermap[h] = "./"..h
+	packagemap["$(PLATIND)/pc86/include/"..h] = "./"..h
+end
+
+addheader("ack/config.h")
+addheader("unistd.h")
+
+acklibrary {
+	name = "headers",
+	hdrs = headermap
+}
+
+installable {
+	name = "pkg",
+	map = packagemap
+}
+
+