From 424e1d8f29af45b06f26f22fd8d9a1bc1dbf4378 Mon Sep 17 00:00:00 2001 From: Piotr Esden-Tempski Date: Sat, 27 Nov 2010 12:32:12 -0800 Subject: [PATCH] Makefiles now searching for arm-none-eabi-gcc in path not assuming it's position in /usr/local for libusb. --- Makefile | 4 ++-- sw/airborne/arch/lpc21/lpcusb/Makefile | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 1b291aebc9..af0bd3282c 100644 --- a/Makefile +++ b/Makefile @@ -58,12 +58,12 @@ MESSAGES_XML = $(CONF)/messages.xml UBX_XML = $(CONF)/ubx.xml XSENS_XML = $(CONF)/xsens_MTi-G.xml TOOLS=$(PAPARAZZI_SRC)/sw/tools -HAVE_ARM_NONE_EABI_GCC := $(wildcard /usr/bin/arm-none-eabi-gcc) +HAVE_ARM_NONE_EABI_GCC := $(shell which arm-none-eabi-gcc) ifeq ($(strip $(HAVE_ARM_NONE_EABI_GCC)),) #ARMGCC=/opt/paparazzi/bin/arm-elf-gcc ARMGCC=/usr/bin/arm-elf-gcc else -ARMGCC=/usr/bin/arm-none-eabi-gcc +ARMGCC=$(HAVE_ARM_NONE_EABI_GCC) endif diff --git a/sw/airborne/arch/lpc21/lpcusb/Makefile b/sw/airborne/arch/lpc21/lpcusb/Makefile index b52b324be7..505dae4dbc 100644 --- a/sw/airborne/arch/lpc21/lpcusb/Makefile +++ b/sw/airborne/arch/lpc21/lpcusb/Makefile @@ -5,7 +5,7 @@ PKG_NAME = target DATE = $$(date +%Y%m%d) # Tool definitions -HAVE_ARM_NONE_EABI_GCC := $(wildcard /usr/bin/arm-none-eabi-gcc) +HAVE_ARM_NONE_EABI_GCC := $(shell which arm-none-eabi-gcc) ifeq ($(strip $(HAVE_ARM_NONE_EABI_GCC)),) CC = arm-elf-gcc