From 576403f22be42343da8e7f2c1cbc7b4aef4fc8ad Mon Sep 17 00:00:00 2001
From: Alexei Podtelezhnikov <apodtele@gmail.com>
Date: Thu, 7 Jan 2021 16:02:32 -0500
Subject: [PATCH] [builds] Relocate `FTMODULE_H'.

* builds/toplevel.mk: Place `FTMODULE_H' in include/.
* builds/freetype.mk: Simplify included path.
---
 ChangeLog          | 7 +++++++
 builds/freetype.mk | 3 +--
 builds/toplevel.mk | 2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 85f431de6..86871ee09 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2021-01-07  Alexei Podtelezhnikov  <apodtele@gmail.com>
+
+	[builds] Relocate `FTMODULE_H'.
+
+	* builds/toplevel.mk: Place `FTMODULE_H' in include/.
+	* builds/freetype.mk: Simplify included path.
+
 2021-01-07  Werner Lemberg  <wl@gnu.org>
 
 	Fix ABI incompatibility.
diff --git a/builds/freetype.mk b/builds/freetype.mk
index 71d3a48c8..54ee9de05 100644
--- a/builds/freetype.mk
+++ b/builds/freetype.mk
@@ -119,8 +119,7 @@ PROJECT_LIBRARY := $(LIB_DIR)/$(LIBRARY).$A
 #                 in the `builds/<system>' directory, as these files will
 #                 override the default sources.
 #
-INCLUDES := $(subst /,$(COMPILER_SEP),$(OBJ_DIR) \
-                                      $(DEVEL_DIR) \
+INCLUDES := $(subst /,$(COMPILER_SEP),$(DEVEL_DIR) \
                                       $(BUILD_DIR) \
                                       $(TOP_DIR)/include)
 
diff --git a/builds/toplevel.mk b/builds/toplevel.mk
index 0cad54333..186db046b 100644
--- a/builds/toplevel.mk
+++ b/builds/toplevel.mk
@@ -68,7 +68,7 @@ endif
 # FTMODULE_H, as its name suggests, indicates where the FreeType module
 # class file resides.
 #
-FTMODULE_H ?= $(OBJ_DIR)/ftmodule.h
+FTMODULE_H ?= $(TOP_DIR)/include/ftmodule.h
 
 
 include $(MODULES_CFG)