From fcd2b51d1972d7be74680ccf78faeb9a1a519a9b Mon Sep 17 00:00:00 2001
From: Jonathan Schleifer <js@heap.zone>
Date: Sun, 15 Oct 2017 22:50:28 +0200
Subject: [PATCH] Use module.modulemap instead of module.map

---
 buildsys.mk.in | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/buildsys.mk.in b/buildsys.mk.in
index 99a4001..ffe53d3 100644
--- a/buildsys.mk.in
+++ b/buildsys.mk.in
@@ -315,15 +315,24 @@ ${FRAMEWORK}: ${EXT_DEPS} ${LIB_OBJS} ${LIB_OBJS_EXTRA}
 		rm -fr $$dir; \
 	done; \
 	${MAKE} includedir=$$PWD/$$out/Headers INSTALL_INCLUDES_IF_SUBDIR=${includesubdir} install-includes; \
-	for i in Info.plist module.map; do \
-		test -f $$i || continue; \
+	if test -f Info.plist; then \
+		i=Info.plist; \
 		${INSTALL_STATUS}; \
 		if ${INSTALL} -m 644 $$i $$out/$$i; then \
 			${INSTALL_OK}; \
 		else \
 			${INSTALL_FAILED}; \
 		fi \
-	done
+	fi; \
+	if test -f module.modulemap; then \
+		i=module.modulemap; \
+		${INSTALL_STATUS}; \
+		if ${MKDIR_P} $$out/Modules && ${INSTALL} -m 644 $$i $$out/Modules/$$i; then \
+			${INSTALL_OK}; \
+		else \
+			${INSTALL_FAILED}; \
+		fi \
+	fi
 
 ${MORPHOS_LIB} ${MORPHOS_LIB_NOINST}: ${EXT_DEPS} ${MORPHOS_LIB_OBJS} ${MORPHOS_LIB_OBJS_EXTRA}
 	${LINK_STATUS}