From 0d8d363de4995ef88df8763b968952cbf2082617 Mon Sep 17 00:00:00 2001
From: Pierre Muller <pierre@freepascal.org>
Date: Wed, 2 Aug 2023 12:58:02 +0200
Subject: [PATCH] Add WINDIRSDIR variable

---
 rtl/inc/Makefile.rtl   | 2 +-
 rtl/win32/Makefile.fpc | 5 +++--
 rtl/win64/Makefile.fpc | 1 +
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/rtl/inc/Makefile.rtl b/rtl/inc/Makefile.rtl
index dfe8d3663b..216f2592be 100644
--- a/rtl/inc/Makefile.rtl
+++ b/rtl/inc/Makefile.rtl
@@ -1434,7 +1434,7 @@ WinApi.Windows$(PPUEXT): $(NSOSDIR)/WinApi.Windows.pp $(WINDOWS_DEPS)
 #
 # Windirs
 #
-WINDIRS_DEPS=windirs.pp $(WINDOWSUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) \
+WINDIRS_DEPS=$(WINDIRSDIR)/windirs.pp $(WINDOWSUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) \
              $(WINDIRS_DEPS_OS) $(WINDIRS_DEPS_CPU)
 
 windirs$(PPUEXT): $(WINDIRS_DEPS)
diff --git a/rtl/win32/Makefile.fpc b/rtl/win32/Makefile.fpc
index 79e1a0c6a0..e28b012980 100644
--- a/rtl/win32/Makefile.fpc
+++ b/rtl/win32/Makefile.fpc
@@ -60,10 +60,11 @@ DLLS=fpcmemdll
 CPU_UNITS=$(CPUUNIT) $(SIGNALSUNIT) $(MMXUNIT)
 # Paths
 OBJPASDIR=$(RTL)/objpas
-FPC_SYSTEM_OPT=-Fu../win
+FPC_SYSTEM_OPT=-Fu$(WINDIR)
 SYSUTILSDIR=$(WINDIR)
-SYSUTILS_OPT=-Fi../win
+SYSUTILS_OPT=-Fi$(WINDIR)
 SYSUTILS_DEPS_OS=$(WINDOWSUNIT)$(PPUEXT) $(WINDIRSUNIT)$(PPUEXT)
+WINDIRSDIR=$(WINDIR)
 
 # Files used by windows.pp
 include $(WININC)/makefile.inc
diff --git a/rtl/win64/Makefile.fpc b/rtl/win64/Makefile.fpc
index a47b3cc49e..8eaf989547 100644
--- a/rtl/win64/Makefile.fpc
+++ b/rtl/win64/Makefile.fpc
@@ -58,6 +58,7 @@ NSOSDIR=$(NSDIR)/windows
 SYSUTILSDIR=$(WINDIR)
 SYSUTILS_OPT=-Fi../win
 SYSUTILS_DEPS_OS=$(WINDOWSUNIT)$(PPUEXT) $(WINDIRSUNIT)$(PPUEXT)
+WINDIRSDIR=$(WINDIR)
 
 UNITPREFIX=rtl
 SYSTEMUNIT=system