@@ -47,11 +47,22 @@
 			[AC_SUBST(DEP_OBJCXXFLAGS, '-MD -MF $${out%.o}.dep')])
 
 		AC_SUBST(AMIGA_LIB_CFLAGS)
 		AC_SUBST(AMIGA_LIB_LDFLAGS)
 
-		AC_PATH_PROG(TPUT, tput)
+		case "$build_os" in
+			morphos*)
+				dnl Don't use tput on MorphOS: The colored
+				dnl output is quite unreadable and in some
+				dnl MorphOS versions, the output from tput is
+				dnl not 8-bit safe, with awk (for AC_SUBST)
+				dnl failing as a result.
+				;;
+			*)
+				AC_PATH_PROG(TPUT, tput)
+				;;
+		esac
 
 		AS_IF([test x"$TPUT" != x""], [
 			if x=$($TPUT el 2>/dev/null); then
 				AC_SUBST(TERM_EL, "$x")
 			else
@@ -307,10 +318,11 @@
 				FRAMEWORK_LDFLAGS_INSTALL_NAME='-Wl,-install_name,@executable_path/../Frameworks/$$out/$${out%.framework}'
 			])
 
 			AC_SUBST(FRAMEWORK_LDFLAGS)
 			AC_SUBST(FRAMEWORK_LDFLAGS_INSTALL_NAME)
+			AC_SUBST(FRAMEWORK_LIBS)
 
 			$1
 			;;
 	esac
 ])