From 0b5fe9eb417c76fa20fe6c7dc9988df6a940df12 Mon Sep 17 00:00:00 2001
From: Antti Kantee <pooka@iki.fi>
Date: Tue, 27 Oct 2015 15:09:38 +0000
Subject: [PATCH] call it rumprun.o, install into rumprun-platform-arch

---
 app-tools/specs-bake.in | 2 +-
 platform/Makefile.inc   | 4 ++--
 tests/nolibc/Makefile   | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app-tools/specs-bake.in b/app-tools/specs-bake.in
index 80484c6..52c877f 100644
--- a/app-tools/specs-bake.in
+++ b/app-tools/specs-bake.in
@@ -1,5 +1,5 @@
 *startfile:
-!DESTDIR!/lib/rumprun-!PLATFORM!-!MACHINE_ARCH!.o
+!DESTDIR!/lib/rumprun-!PLATFORM!-!MACHINE_ARCH!/rumprun.o
 
 *endfile:
 
diff --git a/platform/Makefile.inc b/platform/Makefile.inc
index 7a2517d..9e858be 100644
--- a/platform/Makefile.inc
+++ b/platform/Makefile.inc
@@ -20,7 +20,7 @@ else
 CPPFLAGS+=      -I${RRDEST}/include/rumprun
 endif
 
-MAINOBJ:=	${RROBJ}/rumprun-${PLATFORM}-${MACHINE_ARCH}.o
+MAINOBJ:=	${RROBJ}/rumprun.o
 
 RROBJLIB:=	${RROBJ}/lib
 LIBDIR:=	$(abspath ../../lib)
@@ -99,7 +99,7 @@ tests: ${MAINOBJ} commonlibs
 
 .PHONY: installkern
 installkern:
-	install -m 0444 ${MAINOBJ} ${INSTALLDIR}/lib
+	install -m 0444 ${MAINOBJ} ${INSTALLDIR}/lib/rumprun-${PLATFORM}-${MACHINE_ARCH}
 	install -m 0444 ${LDSCRIPT} ${INSTALLDIR}/lib/rumprun-${PLATFORM}-${MACHINE_ARCH}.ldscript
 
 .PHONY: installuser
diff --git a/tests/nolibc/Makefile b/tests/nolibc/Makefile
index f733559..92882a1 100644
--- a/tests/nolibc/Makefile
+++ b/tests/nolibc/Makefile
@@ -13,7 +13,7 @@ LDSCRIPT=$(abspath ../../platform/${PLATFORM}/bmk.ldscript)
 
 LDFLAGS+= ${LDFLAGS.${PLATFORM}.${MACHINE_ARCH}}
 
-OBJS= main.o ${RROBJ}/rumprun-${PLATFORM}-${MACHINE_ARCH}.o
+OBJS= main.o ${RROBJ}/rumprun.o
 
 .PHONY: clean
 
-- 
2.39.5