From 6cac5de9871f54236f608812582ca5ef3160e634 Mon Sep 17 00:00:00 2001
From: Rudolf Polzer <divverent@alientrap.org>
Date: Sat, 21 Aug 2010 15:20:07 +0200
Subject: [PATCH] allow the path to xonotic.brand to come from
 XONOTIC_BRANDFILE

---
 all                                     | 2 +-
 misc/tools/rebrand-darkplaces-engine.sh | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/all b/all
index d5757dd2..ba0fd468 100755
--- a/all
+++ b/all
@@ -953,7 +953,7 @@ case "$cmd" in
 			esac
 			# now rebrand the binaries...
 			for f in $targetfiles; do
-				verbose "$d0/misc/tools/rebrand-darkplaces-engine.sh" "$d0/misc/tools/xonotic.brand" "${f##*:}" || true
+				verbose "$d0/misc/tools/rebrand-darkplaces-engine.sh" "${XONOTIC_BRAND:-$d0/misc/tools/xonotic.brand}" "${f##*:}" || true
 			done
 		fi
 		;;
diff --git a/misc/tools/rebrand-darkplaces-engine.sh b/misc/tools/rebrand-darkplaces-engine.sh
index 8208d484..6f6a7692 100755
--- a/misc/tools/rebrand-darkplaces-engine.sh
+++ b/misc/tools/rebrand-darkplaces-engine.sh
@@ -11,6 +11,10 @@ icon_icns=Darkplaces.app/Contents/Resources/Darkplaces.icns
 icon_ico=darkplaces.ico
 icon_xpm=darkplaces.xpm
 
+if [ -z "$1" ]; then
+	echo "Usage: $0 brandfile binaries..."
+	exit
+fi
 . "$1"; shift
 
 d=`pwd`
-- 
2.39.2