@@ -9,11 +9,11 @@
 AC_SUBST(BUNDLE_VERSION, 0.90.9900)
 AC_SUBST(BUNDLE_SHORT_VERSION, 0.90)
 
 for i in configure.ac build-aux/m4/*; do
 	AS_IF([test $i -nt configure], [
-		AC_MSG_ERROR([$i is newer than configure! Run autoreconf!])
+		AC_MSG_ERROR([$i is newer than configure! Run ./autogen.sh!])
 	])
 done
 
 BUILDSYS_INIT
 
@@ -56,11 +56,14 @@
 		enable_files="yes"	# Required for reading ENV:
 		supports_amiga_lib="yes"
 		ac_cv_snprintf_useful_ret="yes"
 
 		AS_IF([test x"$enable_amiga_lib" != x"no"], [
+			AC_SUBST(OBJFW_RT_AMIGA_LIB,
+				'objfw_rt_${OBJFW_RT_LIB_MAJOR}_68k.library')
 			AC_SUBST(SFDC_TARGET, m68k-amigaos)
+			AC_SUBST(SFD_FILE, amigaos3.sfd)
 			dnl For 68000, GCC emits calls to helper functions that
 			dnl do not work properly in a library.
 			AC_SUBST(AMIGA_LIB_CFLAGS, "-mcpu=68020 -fbaserel")
 			AC_SUBST(AMIGA_LIB_LDFLAGS,
 				"-mcpu=68020 -fbaserel -resident -nostartfiles")
@@ -80,16 +83,19 @@
 			LDFLAGS="$LDFLAGS -noixemul"
 			enable_files="yes"	# Required for reading ENV:
 			supports_amiga_lib="yes"
 
 			AS_IF([test x"$enable_amiga_lib" != x"no"], [
+				t='objfw_rt_${OBJFW_RT_LIB_MAJOR}_abox.library'
+				AC_SUBST(OBJFW_RT_AMIGA_LIB, $t)
 				AC_SUBST(SFDC_TARGET, ppc-morphos)
-				tmp="-mresident32 -fno-builtin"
-				AC_SUBST(AMIGA_LIB_CFLAGS, $tmp)
-				tmp="-mresident32 -nostartfiles -nodefaultlibs"
-				tmp="$tmp -lc"
-				AC_SUBST(AMIGA_LIB_LDFLAGS, $tmp)
+				AC_SUBST(SFD_FILE, morphos.sfd)
+				t="-mresident32 -fno-builtin"
+				AC_SUBST(AMIGA_LIB_CFLAGS, $t)
+				t="-mresident32 -nostartfiles -nodefaultlibs"
+				t="$tmp -lc"
+				AC_SUBST(AMIGA_LIB_LDFLAGS, $t)
 			])
 		])
 
 		enable_shared="no"
 		enable_threads="no"
@@ -510,11 +516,10 @@
 			AC_SUBST(OBJFW_RT_FRAMEWORK, "ObjFW_RT.framework")
 			AC_SUBST(RUNTIME_FRAMEWORK_LIBS, "-framework ObjFW_RT")
 		])
 
 		AS_IF([test x"$enable_amiga_lib" != x"no"], [
-			AC_SUBST(OBJFW_RT_AMIGA_LIB, objfw_rt.library)
 			AC_SUBST(RUNTIME_LIBS, "-lobjfw_rt.library")
 			AC_SUBST(LINKLIB, linklib)
 			tmp="../src/runtime/linklib/libobjfw_rt.library.a"
 			AC_SUBST(LIBOBJFW_RT_DEP, "$tmp")
 			AC_SUBST(LIBOBJFW_RT_DEP_LVL2, "../$tmp")