From b367c40a59a4fc55d8ae2554b2d4f2ef0afd7cb2 Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@durdin.net>
Date: Thu, 19 May 2022 09:26:00 +1000
Subject: [PATCH] chore(developer): move .mak to src

---
 common/web/keyman-version/build.sh | 2 +-
 developer/Header.mak               | 2 --
 developer/{ => src}/Defines.mak    | 2 +-
 developer/src/Header.mak           | 9 +++++++++
 developer/src/Makefile             | 4 ++--
 developer/{ => src}/Target.mak     | 0
 developer/src/kmanalyze/Makefile   | 4 ++--
 7 files changed, 15 insertions(+), 8 deletions(-)
 delete mode 100644 developer/Header.mak
 rename developer/{ => src}/Defines.mak (88%)
 create mode 100644 developer/src/Header.mak
 rename developer/{ => src}/Target.mak (100%)

diff --git a/common/web/keyman-version/build.sh b/common/web/keyman-version/build.sh
index c38394894a..1ecd052fcc 100755
--- a/common/web/keyman-version/build.sh
+++ b/common/web/keyman-version/build.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Builds the include script for the current Keyman version.
 #
diff --git a/developer/Header.mak b/developer/Header.mak
deleted file mode 100644
index b7e8656dd2..0000000000
--- a/developer/Header.mak
+++ /dev/null
@@ -1,2 +0,0 @@
-# Temporary import of windows/src/Header.mak
-!include ..\windows\src\Header.mak
\ No newline at end of file
diff --git a/developer/Defines.mak b/developer/src/Defines.mak
similarity index 88%
rename from developer/Defines.mak
rename to developer/src/Defines.mak
index dc7d0d0f75..acad0e0f10 100644
--- a/developer/Defines.mak
+++ b/developer/src/Defines.mak
@@ -1,5 +1,5 @@
 !IFNDEF KEYMAN_ROOT
-KEYMAN_ROOT=c:\keyman
+!error KEYMAN_ROOT must be defined
 !ENDIF
 
 DEVELOPER_ROOT=$(KEYMAN_ROOT)\developer
diff --git a/developer/src/Header.mak b/developer/src/Header.mak
new file mode 100644
index 0000000000..850466fddf
--- /dev/null
+++ b/developer/src/Header.mak
@@ -0,0 +1,9 @@
+!IFNDEF KEYMAN_ROOT
+!error KEYMAN_ROOT must be defined
+!ENDIF
+
+DEVELOPER_ROOT=$(KEYMAN_ROOT)\developer
+WINDOWS_ROOT=$(KEYMAN_ROOT)\windows
+
+# Temporary import of windows/src/Header.mak
+!include $(WINDOWS_ROOT)\src\Header.mak
diff --git a/developer/src/Makefile b/developer/src/Makefile
index 300afc3e2a..123dd54fa2 100644
--- a/developer/src/Makefile
+++ b/developer/src/Makefile
@@ -11,7 +11,7 @@ TARGETS=kmcmpdll kmcomp kmanalyze kmconvert tike samples setup inst kmdecomp
 MANIFESTS=kmcomp tike setup
 CLEANS=clean-developer
 
-!include ..\Header.mak
+!include Header.mak
 
 # ----------------------------------------------------------------------
 
@@ -70,7 +70,7 @@ clean-developer:
     cd $(DEVELOPER_ROOT)\src
     -del version.txt
 
-!include ..\Target.mak
+!include Target.mak
 
 # ----------------------------------------------------------------------
 # EOF
diff --git a/developer/Target.mak b/developer/src/Target.mak
similarity index 100%
rename from developer/Target.mak
rename to developer/src/Target.mak
diff --git a/developer/src/kmanalyze/Makefile b/developer/src/kmanalyze/Makefile
index f6a5141ed1..82b1b68a6c 100644
--- a/developer/src/kmanalyze/Makefile
+++ b/developer/src/kmanalyze/Makefile
@@ -2,7 +2,7 @@
 # KMAnalyze Makefile
 #
 
-!include ..\..\Defines.mak
+!include ..\Defines.mak
 
 build: version.res dirs
     $(MSBUILD) kmanalyze.vcxproj $(MSBUILD_BUILD)
@@ -25,4 +25,4 @@ test-manifest:
 install:
     $(COPY) $(DEVELOPER_PROGRAM)\developer\kmanalyze.exe "$(INSTALLPATH_KEYMANDEVELOPER)\kmanalyze.exe"
 
-!include ..\..\Target.mak
+!include ..\Target.mak