From fad168c090600da416b56df391a048c40ec629c1 Mon Sep 17 00:00:00 2001
From: Simon Howard <fraggle@soulsphere.org>
Date: Sun, 8 Jan 2017 00:02:45 +0100
Subject: [PATCH] Move prebuild_setup to environment.sh.

This can be overridden by package files so should be defined here.
---
 chocpkg/chocpkg        | 6 ------
 chocpkg/environment.sh | 6 ++++++
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/chocpkg/chocpkg b/chocpkg/chocpkg
index cccf68e..40a4e08 100755
--- a/chocpkg/chocpkg
+++ b/chocpkg/chocpkg
@@ -120,12 +120,6 @@ cmd_fetch() {
     do_fetch
 }
 
-# Function invoked before a package is built to set up the build environment,
-# if necessary. Can be overridden by pkgdef files.
-prebuild_setup() {
-    true
-}
-
 cmd_build() {
     install_dependencies
     chocpkg fetch "$PACKAGE_NAME"
diff --git a/chocpkg/environment.sh b/chocpkg/environment.sh
index e481170..31b5f06 100755
--- a/chocpkg/environment.sh
+++ b/chocpkg/environment.sh
@@ -148,5 +148,11 @@ setup_build_environment() {
     fi
 }
 
+# Function invoked before a package is built to set up the build environment,
+# if necessary. Can be overridden by pkgdef files.
+prebuild_setup() {
+    true
+}
+
 load_package_file