From 37176cdddf98c8884a39179560d5caa07ceddd0f Mon Sep 17 00:00:00 2001
From: Francis Rowe <info@gluglug.org.uk>
Date: Sat, 13 Dec 2014 16:41:12 +0000
Subject: docs/git/index.html#build: fix build-release instructions

Tell the user how to properly build flashrom/bucts with static
linking. Update build-release.
---
 build-release       | 16 ++++++----------
 builddeps-bucts     |  9 ++++++++-
 docs/git/index.html |  3 ++-
 3 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/build-release b/build-release
index 5b4d7131..b903b3f5 100755
--- a/build-release
+++ b/build-release
@@ -146,22 +146,18 @@ cp resources/grub/config/seabios.cfg libreboot_bin/
 # X60/T60: BUC.TS utility is needed to flash libreboot while Lenovo BIOS is running
 # Include it statically compiled
 cp -r bucts bucts_
-cd bucts/
 # make it statically compile
-git apply ../resources/bucts/patch/staticlink.diff
-make clean
-make
-mkdir ../libreboot_bin/bucts
+./builddeps-bucts static
+mkdir libreboot_bin/bucts
 if [ $(uname -i) = "i686" ] || [ $(uname -m) = "i686" ]
 	then
-		mkdir ../libreboot_bin/bucts/i686
-		mv bucts ../libreboot_bin/bucts/i686
+		mkdir libreboot_bin/bucts/i686
+		mv bucts/bucts libreboot_bin/bucts/i686
 elif [ $(uname -i) = "x86_64" ] || [ $(uname -m) = "x86_64" ]
 	then
-		mkdir ../libreboot_bin/bucts/x86_64
-		mv bucts ../libreboot_bin/bucts/x86_64
+		mkdir libreboot_bin/bucts/x86_64
+		mv bucts/bucts libreboot_bin/bucts/x86_64
 fi
-cd ../
 rm -rf bucts
 mv bucts_ bucts
 
diff --git a/builddeps-bucts b/builddeps-bucts
index ead751ba..7125e837 100755
--- a/builddeps-bucts
+++ b/builddeps-bucts
@@ -32,7 +32,14 @@ cd bucts
 make clean
 
 # build bucts
-make
+if (( $# != 1 )); then
+	# build it dynamically linked
+	make
+else
+	git apply ../resources/bucts/patch/staticlink.diff
+	# build it statically linked
+	make
+fi
 
 # done. go back to main directory
 cd ../
diff --git a/docs/git/index.html b/docs/git/index.html
index c3286b9b..f306a2c3 100644
--- a/docs/git/index.html
+++ b/docs/git/index.html
@@ -529,7 +529,8 @@
 
 			<p>
 				If you are building 32-bit binaries on a live system or chroot (for flashrom/bucts), you can use the following to statically link them:<br/>
-				$ <b>make SHARED=0 CC='gcc -static'</b>
+				$ <b>./builddeps-flashrom static</b><br/>
+				$ <b>./builddeps-bucts static</b>
 			</p>
 
 			<p>
-- 
cgit v1.2.3-70-g09d2