Replace accidentally checked in files with previous ones.

svn path=/trunk/netsurf/; revision=3786

1 files changed, 14 insertions, 16 deletions

diff --git a/makefile b/makefile
index 4298c57db..cd1224480 100644
--- a/makefile
+++ b/makefile
@@ -72,23 +72,8 @@ OBJECTS_GTK += font_pango.o gtk_bitmap.o gtk_gui.o \
 	gtk_history.o gtk_window.o gtk_filetype.o \
 	gtk_download.o						# gtk/
 
-# Default target - platform specific files may specify special-case rules for
-# various files.
-default: riscos
-
-
-# Inclusion of platform specific files has to occur after the OBJDIR stuff as
-# that is referred to in the files
-
-OS = riscos
-ifeq ($(OS),riscos)
-include riscos.mk
-else
-include posix.mk
-endif
 
-
-OBJDIR_RISCOS = arm-riscos-aof
+OBJDIR_RISCOS = $(shell $(CC) -dumpmachine)
 SOURCES_RISCOS=$(OBJECTS_RISCOS:.o=.c)
 OBJS_RISCOS=$(OBJECTS_RISCOS:%.o=$(OBJDIR_RISCOS)/%.o)
 
@@ -106,6 +91,19 @@ OBJDIR_GTK = objects-gtk
 SOURCES_GTK=$(OBJECTS_GTK:.o=.c)
 OBJS_GTK=$(OBJECTS_GTK:%.o=$(OBJDIR_GTK)/%.o)
 
+# Default target - platform specific files may specify special-case rules for
+# various files.
+default: riscos
+
+# Inclusion of platform specific files has to occur after the OBJDIR stuff as
+# that is referred to in the files
+
+OS = $(word 2,$(subst -, ,$(shell $(SYSTEM_CC) -dumpmachine)))
+ifeq ($(OS),riscos)
+include riscos.mk
+else
+include posix.mk
+endif
 
 VPATH = content:content/fetchers:css:desktop:image:render:riscos:riscos/configure:riscos/gui:utils:debug:gtk