From ed7a4f149748248affc525ffeece2864c580c362 Mon Sep 17 00:00:00 2001
From: John Mark Bell <jmb@netsurf-browser.org>
Date: Sat, 24 Jan 2009 12:55:06 +0000
Subject: Fix RO makefile

svn path=/trunk/libcss/; revision=6224
---
 Makefile-riscos | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

(limited to 'Makefile-riscos')

diff --git a/Makefile-riscos b/Makefile-riscos
index 54cce12..9070588 100644
--- a/Makefile-riscos
+++ b/Makefile-riscos
@@ -2,9 +2,9 @@
 GCCSDK_INSTALL_CROSSBIN ?= /home/riscos/cross/bin
 GCCSDK_INSTALL_ENV ?= /home/riscos/env
 
-CC := $(GCCSDK_INSTALL_CROSSBIN)/gcc
-AR := $(GCCSDK_INSTALL_CROSSBIN)/ar
-LD := $(GCCSDK_INSTALL_CROSSBIN)/gcc
+CC := $(wildcard $(GCCSDK_INSTALL_CROSSBIN)/*gcc)
+AR := $(wildcard $(GCCSDK_INSTALL_CROSSBIN)/*ar)
+LD := $(CC)
 
 CP := cp
 RM := rm
@@ -13,12 +13,13 @@ MV := mv
 ECHO := echo
 MAKE := make
 PERL := perl
-PKGCONFIG := pkg-config
+PKGCONFIG := $(GCCSDK_INSTALL_ENV)/ro-pkg-config
 INSTALL := install
 SED := sed
 TOUCH := touch
 LCOV := echo
 GENHTML := echo
+DOXYGEN := doxygen
 
 # Toolchain flags
 WARNFLAGS := -Wall -Wextra -Wundef -Wpointer-arith -Wcast-align \
@@ -40,7 +41,11 @@ MAKEFLAGS :=
 PKGCONFIGFLAGS :=
 TOUCHFLAGS :=
 
-EXEEXT := ,ff8
+ifneq (,$(findstring arm-unknown-riscos-gcc,$(CC)))
+  EXEEXT := ,e1f
+else
+  EXEEXT := ,ff8
+endif
 
 # Default installation prefix
 PREFIX ?= $(GCCSDK_INSTALL_ENV)
-- 
cgit v1.2.3