call it pseudolinkstubs.o, install into lib/rumprun-arch

diff --git a/app-tools/specs-stub.in b/app-tools/specs-stub.in
index 8e3523375ab9f6e79383f8bd0429b3b1dda74714..5659a6c38003dc8ba90bde129eff24da2668c203 100644 (file)
--- a/app-tools/specs-stub.in
+++ b/app-tools/specs-stub.in
@@ -7,7 +7,7 @@
 *lib:
 -L!DESTDIR!/lib/rumprun-!MACHINE_ARCH!         \
     --start-group -lpthread -lc --end-group    \
-    !DESTDIR!/lib/rumprun-!MACHINE_ARCH!-pseudolinkstubs.o
+    !DESTDIR!/lib/rumprun-!MACHINE_ARCH!/pseudolinkstubs.o
 
 *link:
 %{m64:-m elf_x86_64;mx32:-m elf32_x86_64;m32:-m elf_i386} %:replace-outfile(-lstdc++ -lc++) %{rdynamic:}

diff --git a/platform/Makefile.inc b/platform/Makefile.inc
index 9e858be2afb9b18a874cd849686938b8b0ddc606..411186433ed568db611148770e1182dea6ef101d 100644 (file)
--- a/platform/Makefile.inc
+++ b/platform/Makefile.inc
@@ -60,7 +60,7 @@ $(eval $(call BUILDLIB_target,librumprun_tester))
 $(eval $(call BUILDLIB_target,libunwind))
 $(eval $(call BUILDLIB_target,libcompiler_rt,RUMPSRC=${RUMPSRC}))
 
-PSEUDOSTUBS=${RROBJ}/rumprun-${MACHINE_ARCH}-pseudolinkstubs
+PSEUDOSTUBS:= ${RROBJ}/pseudolinkstubs
 
 ${PSEUDOSTUBS}.c: ${RROBJLIB}/librumprun_base/librumprun_base.a
        sh ../makepseudolinkstubs.sh ${NM} ${RUMPSRC} $< $@
@@ -104,7 +104,7 @@ installkern:
 
 .PHONY: installuser
 installuser:
-       install -m 0444 ${PSEUDOSTUBS}.o ${INSTALLDIR}/lib
+       install -m 0444 ${PSEUDOSTUBS}.o ${INSTALLDIR}/lib/rumprun-${MACHINE_ARCH}
 
 INSTALLTGTS+=  installkern
 ifneq (${KERNONLY},true)