From c75c89d2425ab0c69e94d45a5d956286838bbc67 Mon Sep 17 00:00:00 2001
From: Mikko Rasa <tdb@tdb.fi>
Date: Mon, 6 Oct 2014 23:58:30 +0300
Subject: [PATCH] Move the bpk files into a subdirectory and install them

---
 Build                                 | 5 +++++
 devil.bpk => packages/devil.bpk       | 0
 gmpxx.bpk => packages/gmpxx.bpk       | 0
 openal.bpk => packages/openal.bpk     | 0
 opengl.bpk => packages/opengl.bpk     | 0
 opengles.bpk => packages/opengles.bpk | 0
 xlib.bpk => packages/xlib.bpk         | 0
 source/buildercli.cpp                 | 2 +-
 8 files changed, 6 insertions(+), 1 deletion(-)
 rename devil.bpk => packages/devil.bpk (100%)
 rename gmpxx.bpk => packages/gmpxx.bpk (100%)
 rename openal.bpk => packages/openal.bpk (100%)
 rename opengl.bpk => packages/opengl.bpk (100%)
 rename opengles.bpk => packages/opengles.bpk (100%)
 rename xlib.bpk => packages/xlib.bpk (100%)

diff --git a/Build b/Build
index fff39a9..5e50e8f 100644
--- a/Build
+++ b/Build
@@ -26,4 +26,9 @@ package "builder"
 	{
 		source "builderrc";
 	};
+
+	install "share/builder/packages"
+	{
+		source "packages";
+	};
 };
diff --git a/devil.bpk b/packages/devil.bpk
similarity index 100%
rename from devil.bpk
rename to packages/devil.bpk
diff --git a/gmpxx.bpk b/packages/gmpxx.bpk
similarity index 100%
rename from gmpxx.bpk
rename to packages/gmpxx.bpk
diff --git a/openal.bpk b/packages/openal.bpk
similarity index 100%
rename from openal.bpk
rename to packages/openal.bpk
diff --git a/opengl.bpk b/packages/opengl.bpk
similarity index 100%
rename from opengl.bpk
rename to packages/opengl.bpk
diff --git a/opengles.bpk b/packages/opengles.bpk
similarity index 100%
rename from opengles.bpk
rename to packages/opengles.bpk
diff --git a/xlib.bpk b/packages/xlib.bpk
similarity index 100%
rename from xlib.bpk
rename to packages/xlib.bpk
diff --git a/source/buildercli.cpp b/source/buildercli.cpp
index 0ce2bdc..7482ace 100644
--- a/source/buildercli.cpp
+++ b/source/buildercli.cpp
@@ -144,7 +144,7 @@ BuilderCLI::BuilderCLI(int argc, char **argv):
 
 	package_manager.append_package_path(cwd);
 	package_manager.append_package_path(cwd/"..");
-	package_manager.append_binary_package_path(FS::get_sys_data_dir(argv[0], "builder"));
+	package_manager.append_binary_package_path(FS::get_sys_data_dir(argv[0], "builder")/"packages");
 
 	package_manager.set_no_externals(no_externals);
 
-- 
2.43.0