Author: jmb
Date: Sat Jan 24 06:55:06 2009
New Revision: 6224
URL: http://source.netsurf-browser.org?rev=6224&view=rev
Log:
Fix RO makefile
Modified:
trunk/libcss/Makefile-riscos
Modified: trunk/libcss/Makefile-riscos
URL:
http://source.netsurf-browser.org/trunk/libcss/Makefile-riscos?rev=6224&r1=6223&r2=6224&view=diff
==============================================================================
--- trunk/libcss/Makefile-riscos (original)
+++ trunk/libcss/Makefile-riscos Sat Jan 24 06:55:06 2009
@@ -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 @@
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 @@
PKGCONFIGFLAGS :=
TOUCHFLAGS :=
-EXEEXT := ,ff8
+ifneq (,$(findstring arm-unknown-riscos-gcc,$(CC)))
+ EXEEXT := ,e1f
+else
+ EXEEXT := ,ff8
+endif
# Default installation prefix
PREFIX ?= $(GCCSDK_INSTALL_ENV)
_______________________________________________
netsurf-commits mailing list
[email protected]
http://vlists.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
