Fixups

Author: helje5

Makefile

@@ -1,7 +1,7 @@
 # Makefile
 # Copyright © 2018 ZeeZide GmbH. All rights reserved.
 
-include /usr/local/lib/swift-xcode/makefiles/swift-xcode-config.make
+include config.make
 
 PACKAGE = SwiftNIO
 MAJOR=0
@@ -84,6 +84,5 @@ uninstall-project-server-templates :
 		$(XCODE_TEMPLATE_PROJECT_SERVER_SOURCE_DIR)/Swift\ NIO.xctemplate
 
 install-file-server-templates : uninstall-file-server-templates
-	# $(MKDIR_P) $(XCODE_TEMPLATE_FILE_SERVER_SOURCE_DIR)
 
 uninstall-file-server-templates :

config.make

@@ -0,0 +1,13 @@
+# Makefile
+# Copyright © 2018 ZeeZide GmbH. All rights reserved.
+
+include /usr/local/lib/swift-xcode/makefiles/swift-xcode-config.make
+
+ifeq ($(SWIFT_ABI_LIB_INSTALL_DIR),)
+  # macOS seems to use this for modmaps: /usr/lib/swift/macosx/x86_64/
+  # and this for the dylibs: /usr/lib/swift/macosx/
+  # FIXME: we changed this to the TARGET, needs to be:
+  #   /usr/local/lib/swift4.0/x86_64-apple-macosx10.13
+  # and we need to allow configuration on what we build for.
+  SWIFT_ABI_LIB_INSTALL_DIR=$(prefix)/lib/$(SWIFT_ABI_RELDIR)/$(TARGET)
+endif