diff build-data.sh @ 53:554e3f02ba6f

Unify / update build system.
author Matti Hamalainen <ccr@tnsp.org>
date Mon, 03 Oct 2016 09:20:32 +0300
parents 9cbb03e85597
children
line wrap: on
line diff
--- a/build-data.sh	Mon Oct 03 08:51:31 2016 +0300
+++ b/build-data.sh	Mon Oct 03 09:20:32 2016 +0300
@@ -5,11 +5,11 @@
 
 if test ! -x "$CPACKED"; then
 	make -f Makefile clean
-	make -f Makefile EXEEXT=".bin" BINPATH="$CPWD/" "$CPACKED"
+	make -f Makefile EXEEXT=".bin" TOOL_BINPATH="$CPWD/" "$CPACKED"
 fi
 
-cd "$CPWD/data" && $CPACKED -c -p "$CPWD/exe/$CPACKFILE" *
+cd "$CPWD/data" && $CPACKED -c -p "$CPWD/$CBINPATH/$CPACKFILE" *
 
 if test ! -e "$CPWD/$CPACKFILE"; then
-	ln -s "$CPWD/exe/$CPACKFILE" "$CPWD/$CPACKFILE"
+	ln -s "$CPWD/$CBINPATH/$CPACKFILE" "$CPWD/$CPACKFILE"
 fi