From a204ad557dd504391e13e1382278472cd86517f4 Mon Sep 17 00:00:00 2001
From: Alexandre Julliard <julliard@winehq.org>
Date: Wed, 9 Sep 2020 11:36:45 +0200
Subject: [PATCH] makefiles: Expand makedep path at compile time.

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
---
 dlls/gdi32/Makefile.in    | 2 +-
 dlls/ntdll/Makefile.in    | 8 ++++----
 libs/wine/Makefile.in     | 8 ++++----
 loader/Makefile.in        | 2 +-
 tools/widl/Makefile.in    | 2 +-
 tools/winegcc/Makefile.in | 4 ++--
 tools/wmc/Makefile.in     | 2 +-
 tools/wrc/Makefile.in     | 4 ++--
 8 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/dlls/gdi32/Makefile.in b/dlls/gdi32/Makefile.in
index 32b2e6959c1..a94abad599d 100644
--- a/dlls/gdi32/Makefile.in
+++ b/dlls/gdi32/Makefile.in
@@ -52,4 +52,4 @@ C_SRCS = \
 
 RC_SRCS = gdi32.rc
 
-freetype_EXTRADEFS = -DWINE_FONT_DIR=\"`$(MAKEDEP) -R ${datadir}/wine ${fontdir}`\"
+freetype_EXTRADEFS = -DWINE_FONT_DIR=\"`${MAKEDEP} -R ${datadir}/wine ${fontdir}`\"
diff --git a/dlls/ntdll/Makefile.in b/dlls/ntdll/Makefile.in
index 52f63892af6..a553536d4c7 100644
--- a/dlls/ntdll/Makefile.in
+++ b/dlls/ntdll/Makefile.in
@@ -72,13 +72,13 @@ EXTRA_OBJS = unix/version.o
 
 server_EXTRADEFS = \
 	-DBINDIR=\"${bindir}\" \
-	-DBIN_TO_DLLDIR=\"`$(MAKEDEP) -R ${bindir} ${dlldir}`\" \
-	-DDLL_TO_BINDIR=\"`$(MAKEDEP) -R ${dlldir} ${bindir}`\"
+	-DBIN_TO_DLLDIR=\"`${MAKEDEP} -R ${bindir} ${dlldir}`\" \
+	-DDLL_TO_BINDIR=\"`${MAKEDEP} -R ${dlldir} ${bindir}`\"
 
 unix_loader_EXTRADEFS = \
 	-DBINDIR=\"${bindir}\" \
-	-DDLL_TO_BINDIR=\"`$(MAKEDEP) -R ${dlldir} ${bindir}`\" \
-	-DBIN_TO_DATADIR=\"`$(MAKEDEP) -R ${bindir} ${datadir}/wine`\"
+	-DDLL_TO_BINDIR=\"`${MAKEDEP} -R ${dlldir} ${bindir}`\" \
+	-DBIN_TO_DATADIR=\"`${MAKEDEP} -R ${bindir} ${datadir}/wine`\"
 
 unix/version.c: dummy
 	version=`(GIT_DIR=$(top_srcdir)/.git git describe HEAD 2>/dev/null || echo "wine-$(PACKAGE_VERSION)") | sed -n -e '$$s/\(.*\)/const char wine_build[] = "\1";/p'` && (echo $$version | cmp -s - $@) || echo $$version >$@ || (rm -f $@ && exit 1)
diff --git a/libs/wine/Makefile.in b/libs/wine/Makefile.in
index 6bb27e34dca..65a07895027 100644
--- a/libs/wine/Makefile.in
+++ b/libs/wine/Makefile.in
@@ -87,10 +87,10 @@ C_SRCS = \
 config_EXTRADEFS = \
 	-DBINDIR='"${bindir}"' \
 	-DDLLDIR='"${dlldir}"' \
-	-DLIB_TO_BINDIR=\"`$(MAKEDEP) -R ${libdir} ${bindir}`\" \
-	-DLIB_TO_DLLDIR=\"`$(MAKEDEP) -R ${libdir} ${dlldir}`\" \
-	-DBIN_TO_DLLDIR=\"`$(MAKEDEP) -R ${bindir} ${dlldir}`\" \
-	-DBIN_TO_DATADIR=\"`$(MAKEDEP) -R ${bindir} ${datadir}/wine`\"
+	-DLIB_TO_BINDIR=\"`${MAKEDEP} -R ${libdir} ${bindir}`\" \
+	-DLIB_TO_DLLDIR=\"`${MAKEDEP} -R ${libdir} ${dlldir}`\" \
+	-DBIN_TO_DLLDIR=\"`${MAKEDEP} -R ${bindir} ${dlldir}`\" \
+	-DBIN_TO_DATADIR=\"`${MAKEDEP} -R ${bindir} ${datadir}/wine`\"
 
 SHAREDLIB = $(LIBWINE_SHAREDLIB)
 
diff --git a/loader/Makefile.in b/loader/Makefile.in
index 1cb9ab6bf7c..e8c271f15d3 100644
--- a/loader/Makefile.in
+++ b/loader/Makefile.in
@@ -18,7 +18,7 @@ INSTALL_LIB = $(WINELOADER_PROGRAMS)
 
 preloader_EXTRADEFS = -fno-builtin
 
-main_EXTRADEFS = -DDLLDIR=\"${dlldir}\" -DBIN_TO_DLLDIR=\"`$(MAKEDEP) -R ${bindir} ${dlldir}`\"
+main_EXTRADEFS = -DDLLDIR=\"${dlldir}\" -DBIN_TO_DLLDIR=\"`${MAKEDEP} -R ${bindir} ${dlldir}`\"
 
 wine_OBJS = main.o
 wine_DEPS = $(WINELOADER_DEPENDS)
diff --git a/tools/widl/Makefile.in b/tools/widl/Makefile.in
index 6c74e88d259..a231087f37c 100644
--- a/tools/widl/Makefile.in
+++ b/tools/widl/Makefile.in
@@ -21,7 +21,7 @@ BISON_SRCS = parser.y
 
 widl_EXTRADEFS = \
 	-DINCLUDEDIR="\"${includedir}\"" \
-	-DBIN_TO_INCLUDEDIR=\"`$(MAKEDEP) -R ${bindir} ${includedir}`\"
+	-DBIN_TO_INCLUDEDIR=\"`${MAKEDEP} -R ${bindir} ${includedir}`\"
 
 EXTRALIBS = -lwpp
 
diff --git a/tools/winegcc/Makefile.in b/tools/winegcc/Makefile.in
index 0d94eed5ff3..8328d6f34a2 100644
--- a/tools/winegcc/Makefile.in
+++ b/tools/winegcc/Makefile.in
@@ -11,8 +11,8 @@ C_SRCS = \
 winegcc_EXTRADEFS = \
 	-DINCLUDEDIR="\"${includedir}\"" \
 	-DLIBDIR="\"${libdir}\"" \
-	-DBIN_TO_INCLUDEDIR=\"`$(MAKEDEP) -R ${bindir} ${includedir}`\" \
-	-DBIN_TO_LIBDIR=\"`$(MAKEDEP) -R ${bindir} ${libdir}`\" \
+	-DBIN_TO_INCLUDEDIR=\"`${MAKEDEP} -R ${bindir} ${includedir}`\" \
+	-DBIN_TO_LIBDIR=\"`${MAKEDEP} -R ${bindir} ${libdir}`\" \
 	-DCC="\"$(CC)\"" \
 	-DCPP="\"$(CPPBIN)\"" \
 	-DCXX="\"$(CXX)\"" \
diff --git a/tools/wmc/Makefile.in b/tools/wmc/Makefile.in
index 660bc940f4b..9d7c87e8fd0 100644
--- a/tools/wmc/Makefile.in
+++ b/tools/wmc/Makefile.in
@@ -13,7 +13,7 @@ BISON_SRCS = mcy.y
 
 wmc_EXTRADEFS = \
 	-DNLSDIR="\"${nlsdir}\"" \
-	-DBIN_TO_NLSDIR=\"`$(MAKEDEP) -R ${bindir} ${nlsdir}`\"
+	-DBIN_TO_NLSDIR=\"`${MAKEDEP} -R ${bindir} ${nlsdir}`\"
 
 EXTRALIBS = $(GETTEXTPO_LIBS)
 
diff --git a/tools/wrc/Makefile.in b/tools/wrc/Makefile.in
index b7462e3b994..fb6eba20c27 100644
--- a/tools/wrc/Makefile.in
+++ b/tools/wrc/Makefile.in
@@ -17,8 +17,8 @@ BISON_SRCS = parser.y
 wrc_EXTRADEFS = \
 	-DNLSDIR="\"${nlsdir}\"" \
 	-DINCLUDEDIR="\"${includedir}\"" \
-	-DBIN_TO_NLSDIR=\"`$(MAKEDEP) -R ${bindir} ${nlsdir}`\" \
-	-DBIN_TO_INCLUDEDIR=\"`$(MAKEDEP) -R ${bindir} ${includedir}`\"
+	-DBIN_TO_NLSDIR=\"`${MAKEDEP} -R ${bindir} ${nlsdir}`\" \
+	-DBIN_TO_INCLUDEDIR=\"`${MAKEDEP} -R ${bindir} ${includedir}`\"
 
 EXTRALIBS = $(GETTEXTPO_LIBS) -lwpp