Index: configure.ac
==================================================================
--- configure.ac
+++ configure.ac
@@ -48,13 +48,13 @@
 		AC_DEFINE(__have_longlong64, 1,
 			[Required for AmigaOS to correctly define PRI?64])
 
 		AC_SUBST(NOIXEMUL, -noixemul)
 		AC_SUBST(OBJFW_RT_AMIGA_LIB, objfw_rt.library)
-		AC_SUBST(OBJFW_RT_AMIGA_LINKLIB, libobjfw_rt.linklib.a)
 		AC_SUBST(OBJFW_RT_INLINE_H, ObjFW_RT_inline.h)
 		AC_SUBST(SFDC_TARGET, m68k-amigaos)
+		AC_SUBST(LINKLIB, linklib)
 		;;
 	powerpc-*-amigaos*)
 		enable_shared="no"
 		enable_threads="no"
 		;;
@@ -68,13 +68,13 @@
 			LDFLAGS="$LDFLAGS -noixemul"
 			enable_files="yes"	# Required for reading ENV:
 
 			AC_SUBST(NOIXEMUL, -noixemul)
 			AC_SUBST(OBJFW_RT_AMIGA_LIB, objfw_rt.library)
-			AC_SUBST(OBJFW_RT_AMIGA_LINKLIB, libobjfw_rt.linklib.a)
 			AC_SUBST(OBJFW_RT_INLINE_H, ObjFW_RT_inline.h)
 			AC_SUBST(SFDC_TARGET, ppc-morphos)
+			AC_SUBST(LINKLIB, linklib)
 		])
 
 		enable_shared="no"
 		enable_threads="no"
 		;;

Index: extra.mk.in
==================================================================
--- extra.mk.in
+++ extra.mk.in
@@ -8,11 +8,10 @@
 
 OBJFW_RT_SHARED_LIB = @OBJFW_RT_SHARED_LIB@
 OBJFW_RT_STATIC_LIB = @OBJFW_RT_STATIC_LIB@
 OBJFW_RT_FRAMEWORK = @OBJFW_RT_FRAMEWORK@
 OBJFW_RT_AMIGA_LIB = @OBJFW_RT_AMIGA_LIB@
-OBJFW_RT_AMIGA_LINKLIB = @OBJFW_RT_AMIGA_LINKLIB@
 OBJFW_RT_LIB_MAJOR = 0
 OBJFW_RT_LIB_MINOR = 0
 OBJFW_RT_LIB_MAJOR_MINOR = ${OBJFW_RT_LIB_MAJOR}.${OBJFW_RT_LIB_MINOR}
 
 OBJFW_BRIDGE_SHARED_LIB = @OBJFW_BRIDGE_SHARED_LIB@
@@ -44,10 +43,11 @@
 INVOCATION_LIB_A = @INVOCATION_LIB_A@
 LIBOBJFW_DEP = @LIBOBJFW_DEP@
 LIBOBJFW_DEP_LVL2 = @LIBOBJFW_DEP_LVL2@
 LIBOBJFW_RT_DEP = @LIBOBJFW_RT_DEP@
 LIBOBJFW_RT_DEP_LVL2 = @LIBOBJFW_RT_DEP_LVL2@
+LINKLIB = @LINKLIB@
 LOOKUP_ASM_A = @LOOKUP_ASM_A@
 LOOKUP_ASM_LIB_A = @LOOKUP_ASM_LIB_A@
 LOOKUP_ASM_LOOKUP_ASM_A = @LOOKUP_ASM_LOOKUP_ASM_A@
 LOOKUP_ASM_LOOKUP_ASM_LIB_A = @LOOKUP_ASM_LOOKUP_ASM_LIB_A@
 MAP_LDFLAGS = @MAP_LDFLAGS@

Index: src/runtime/Makefile
==================================================================
--- src/runtime/Makefile
+++ src/runtime/Makefile
@@ -1,9 +1,9 @@
 include ../../extra.mk
 
 SUBDIRS = lookup-asm
-SUBDIRS_AFTER = linklib
+SUBDIRS_AFTER = ${LINKLIB}
 CLEAN = ${OBJFW_RT_INLINE_H}
 
 SHARED_LIB = ${OBJFW_RT_SHARED_LIB}
 STATIC_LIB = ${OBJFW_RT_STATIC_LIB}
 FRAMEWORK = ${OBJFW_RT_FRAMEWORK}

Index: src/runtime/linklib/Makefile
==================================================================
--- src/runtime/linklib/Makefile
+++ src/runtime/linklib/Makefile
@@ -1,9 +1,9 @@
 include ../../../extra.mk
 
-STATIC_LIB = ${OBJFW_RT_AMIGA_LINKLIB}
+STATIC_LIB = libobjfw_rt.linklib.a
 SRCS = linklib.m
 
 include ../../../buildsys.mk
 
 CPPFLAGS += -DOBJC_COMPILING_AMIGA_LINKLIB -I.. -I../.. -I../../..
 LD = ${OBJC}