Rebase against 0ead40dc9b87ebbd74ad6ebda0182365ab2efde3.

This commit is contained in:
Zebediah Figura
2020-09-09 19:57:52 -05:00
parent 9a9401026f
commit 88e6b6c65c
13 changed files with 23 additions and 307 deletions

View File

@@ -1,4 +1,4 @@
From bb64d06b76f761af74d6d7beb94997cc8953ca0d Mon Sep 17 00:00:00 2001
From b1bbc311c1e2dec72e04be9c668b6072d11b04fb Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Thu, 2 Oct 2014 19:53:46 +0200
Subject: [PATCH] winelib: Append '(Staging)' at the end of the version string.
@@ -8,11 +8,11 @@ Subject: [PATCH] winelib: Append '(Staging)' at the end of the version string.
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dlls/ntdll/Makefile.in b/dlls/ntdll/Makefile.in
index 52f63892af6..f9029b49a6f 100644
index a553536d4c7..71e3df13b66 100644
--- a/dlls/ntdll/Makefile.in
+++ b/dlls/ntdll/Makefile.in
@@ -81,7 +81,7 @@ unix_loader_EXTRADEFS = \
-DBIN_TO_DATADIR=\"`$(MAKEDEP) -R ${bindir} ${datadir}/wine`\"
-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)