From 4dd4cf8bc0dcd4ac92f80bf4e1323d4d1caf1c78 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Tue, 3 May 2011 13:19:03 +0200
Subject: DS: Remove references to DEVKITARM

In some places we used $DEVKITARM, but in others we hardcode the path
$DEVKITPRO/devkitARM. To ensure consistent behavior, I changed it to the
latter everywhere for now. Should it turn out that we really want to
have this flexible, we can reintroduce $DEVKITARM in a proper way. In
that case, we could augment configure to set DEVKITARM to
$DEVKITPRO/devkitARM, if it has not been set yet.
---
 backends/platform/ds/ds.mk    | 4 ++--
 backends/platform/ds/makefile | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/backends/platform/ds/ds.mk b/backends/platform/ds/ds.mk
index a9ed3e0096..654475e1f3 100644
--- a/backends/platform/ds/ds.mk
+++ b/backends/platform/ds/ds.mk
@@ -170,10 +170,10 @@ dsclean:
 
 # HACK/FIXME: C compiler, for cartreset.c -- we should switch this to use CXX
 # as soon as possible.
-CC := $(DEVKITARM)/bin/arm-eabi-gcc
+CC := $(DEVKITPRO)/devkitARM/bin/arm-eabi-gcc
 
 # HACK/TODO: Pointer to objcopy. This should really be set by configure
-OBJCOPY := $(DEVKITARM)/bin/arm-eabi-objcopy
+OBJCOPY := $(DEVKITPRO)/devkitARM/bin/arm-eabi-objcopy
 
 #
 # Set various flags
diff --git a/backends/platform/ds/makefile b/backends/platform/ds/makefile
index 58d6fd4c02..e24a36ef81 100644
--- a/backends/platform/ds/makefile
+++ b/backends/platform/ds/makefile
@@ -3,7 +3,7 @@
 
 
 
-export PATH	:=	$(DEVKITARM)/bin:$(PATH)
+export PATH	:=	$(DEVKITPRO)/devkitARM/bin:$(PATH)
 
 export portdir = $(CURDIR)/arm9
 export srcdir = $(CURDIR)/../../..
-- 
cgit v1.2.3