@@ -400,10 +400,25 @@
 	AC_SUBST(INVOCATION_A, "invocation.a")
 	AC_SUBST(INVOCATION_INVOCATION_A, "invocation/invocation.a")
 	AC_SUBST(LOOKUP_ASM_A, "lookup-asm.a")
 	AC_SUBST(LOOKUP_ASM_LOOKUP_ASM_A, "lookup-asm/lookup-asm.a")
 ])
+
+AS_IF([test x"$enable_amiga_lib" != x"no"], [
+	AC_SUBST(EXCEPTIONS_AMIGALIB_A, "exceptions.amigalib.a")
+	AC_SUBST(EXCEPTIONS_EXCEPTIONS_AMIGALIB_A,
+		"exceptions/exceptions.amigalib.a")
+	AC_SUBST(FORWARDING_AMIGALIB_A, "forwarding.amigalib.a")
+	AC_SUBST(FORWARDING_FORWARDING_AMIGALIB_A,
+		"forwarding/forwarding.amigalib.a")
+	AC_SUBST(INVOCATION_AMIGALIB_A, "invocation.amigalib.a")
+	AC_SUBST(INVOCATION_INVOCATION_AMIGALIB_A,
+		"invocation/invocation.amigalib.a")
+	AC_SUBST(LOOKUP_ASM_AMIGALIB_A, "lookup-asm.amigalib.a")
+	AC_SUBST(LOOKUP_ASM_LOOKUP_ASM_AMIGALIB_A,
+		"lookup-asm/lookup-asm.amigalib.a")
+])
 
 AC_DEFINE_UNQUOTED(PLUGIN_SUFFIX, "$PLUGIN_SUFFIX", [Suffix for plugins])
 AS_IF([test x"$enable_files" != x"no" -a x"$PLUGIN_SUFFIX" != x""], [
 	AC_SUBST(USE_SRCS_PLUGINS, '${SRCS_PLUGINS}')
 	AC_SUBST(TESTPLUGIN, "plugin")
@@ -892,10 +907,15 @@
 		AC_SUBST(ENCODINGS_ENCODINGS_LIB_A, "encodings/encodings.lib.a")
 	])
 	AS_IF([test x"$enable_static" = x"yes" -o x"$enable_shared" = x"no"], [
 		AC_SUBST(ENCODINGS_A, "encodings.a")
 		AC_SUBST(ENCODINGS_ENCODINGS_A, "encodings/encodings.a")
+	])
+	AS_IF([test x"$enable_amiga_lib" != x"no"], [
+		AC_SUBST(ENCODINGS_AMIGALIB_A, "encodings.amigalib.a")
+		AC_SUBST(ENCODINGS_ENCODINGS_AMIGALIB_A,
+			"encodings/encodings.amigalib.a")
 	])
 ])
 
 AC_CHECK_FUNC(arc4random, [
 	AC_DEFINE(OF_HAVE_ARC4RANDOM, 1, [Whether we have arc4random()])