From b6bd35298befb6374641b487b3477ff7fd028aaf Mon Sep 17 00:00:00 2001
From: Daniel Stenberg <daniel@haxx.se>
Date: Tue, 22 Apr 2003 22:19:19 +0000
Subject: use TOOLSDIR as passed-in

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@3580 a1c6a512-1295-4272-9138-f99709370657
---
 apps/Makefile | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/apps/Makefile b/apps/Makefile
index c3fc170600..6aecee592d 100644
--- a/apps/Makefile
+++ b/apps/Makefile
@@ -67,6 +67,11 @@ no_configure:
 	@echo "http://rockbox.haxx.se/docs/how_to_compile.html"
 endif
 
+ifndef TOOLSDIR
+no_toolsdir:
+	@echo "Rerun the configure script."
+endif
+
 all : $(OBJDIR)/$(OUTNAME)
 
 $(OBJDIR)/librockbox.a:
@@ -84,10 +89,10 @@ $(OBJDIR)/rockbox.bin : $(OBJDIR)/rockbox.elf
 	$(OC) -O binary $(OBJDIR)/rockbox.elf $(OBJDIR)/rockbox.bin
 
 $(OBJDIR)/rockbox.asm: $(OBJDIR)/rockbox.bin
-	../tools/sh2d -sh1 $(OBJDIR)/rockbox.bin > $(OBJDIR)/rockbox.asm
+	$(TOOLSDIR)/sh2d -sh1 $(OBJDIR)/rockbox.bin > $(OBJDIR)/rockbox.asm
 
 $(OBJDIR)/$(OUTNAME) : $(OBJDIR)/rockbox.bin
-	../tools/scramble $(SCRAMBLE_OPT) $(OBJDIR)/rockbox.bin $(OBJDIR)/$(OUTNAME)
+	$(TOOLSDIR)/scramble $(SCRAMBLE_OPT) $(OBJDIR)/rockbox.bin $(OBJDIR)/$(OUTNAME)
 
 $(OBJDIR)/credits.raw: $(DOCSDIR)/CREDITS
 	perl credits.pl < $< > $@
@@ -100,11 +105,11 @@ $(OBJDIR)/%.o: %.c
 	@mkdir -p `dirname $@`
 	$(CC) $(CFLAGS) -c $< -o $@
 
-$(OBJDIR)/build.lang: lang/$(LANGUAGE).lang ../tools/uplang
-	perl ../tools/uplang lang/english.lang $< > $@
+$(OBJDIR)/build.lang: lang/$(LANGUAGE).lang $(TOOLSDIR)/uplang
+	perl $(TOOLSDIR)/uplang lang/english.lang $< > $@
 
-$(OBJDIR)/lang.o: $(OBJDIR)/build.lang ../tools/genlang
-	perl -s ../tools/genlang -p=$(OBJDIR)/lang $<
+$(OBJDIR)/lang.o: $(OBJDIR)/build.lang $(TOOLSDIR)/genlang
+	perl -s $(TOOLSDIR)/genlang -p=$(OBJDIR)/lang $<
 	$(CC) $(CFLAGS) -c $(OBJDIR)/lang.c -o $@
 
 clean:
-- 
cgit v1.2.3