From: Michael Gilbert <mgilbert@debian.org>
Date: Tue, 13 Sep 2022 00:46:21 +0000 (+0100)
Subject: don't append wine to the default path settings
X-Git-Tag: archive/raspbian/7.0_repack-10+rpi1~2^2^2^2~41
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=44317a36b261d98c1ff651d2c910245211c30d48;p=wine.git

don't append wine to the default path settings

forwarded: not-needed


Gbp-Pq: Topic debianization
Gbp-Pq: Name install-paths.patch
---

diff --git a/configure.ac b/configure.ac
index d8f5403..ef82429 100644
--- a/configure.ac
+++ b/configure.ac
@@ -95,9 +95,9 @@ AC_ARG_WITH(wine64,    AS_HELP_STRING([--with-wine64=DIR],[use the 64-bit Wine i
 
 AC_CANONICAL_HOST
 
-AC_SUBST(dlldir,[\${libdir}/wine])
-AC_SUBST(fontdir,[\${datadir}/wine/fonts])
-AC_SUBST(nlsdir,[\${datadir}/wine/nls])
+AC_SUBST(dlldir,[\${libdir}])
+AC_SUBST(fontdir,[/usr/share/wine/fonts])
+AC_SUBST(nlsdir,[\${datadir}/nls])
 AC_SUBST(srcdir)
 
 dnl **** Check for some programs ****
diff --git a/dlls/ntdll/Makefile.in b/dlls/ntdll/Makefile.in
index 185bc56..a66cabd 100644
--- a/dlls/ntdll/Makefile.in
+++ b/dlls/ntdll/Makefile.in
@@ -75,4 +75,4 @@ unix_loader_EXTRADEFS = \
 	-DBINDIR=\"${bindir}\" \
 	-DSYSTEMDLLPATH=\"${system_dllpath}\" \
 	-DDLL_TO_BINDIR=\"`${MAKEDEP} -R ${dlldir} ${bindir}`\" \
-	-DBIN_TO_DATADIR=\"`${MAKEDEP} -R ${bindir} ${datadir}/wine`\"
+	-DBIN_TO_DATADIR=\"`${MAKEDEP} -R ${bindir} ${datadir}`\"
diff --git a/libs/wine/Makefile.in b/libs/wine/Makefile.in
index 885a732..9036c95 100644
--- a/libs/wine/Makefile.in
+++ b/libs/wine/Makefile.in
@@ -93,7 +93,7 @@ config_EXTRADEFS = \
 	-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`\"
+	-DBIN_TO_DATADIR=\"`${MAKEDEP} -R ${bindir} ${datadir}`\"
 
 SHAREDLIB = $(LIBWINE_SHAREDLIB)
 
diff --git a/tools/makedep.c b/tools/makedep.c
index e69dc3c..d6ff280 100644
--- a/tools/makedep.c
+++ b/tools/makedep.c
@@ -2897,7 +2897,7 @@ static void output_source_in( struct makefile *make, struct incl_file *source, c
     output( "%s:", obj_dir_path( make, obj ));
     output_filenames( source->dependencies );
     output( "\n" );
-    add_install_rule( make, obj, xstrdup( obj ), strmake( "d$(datadir)/wine/%s", obj ));
+    add_install_rule( make, obj, xstrdup( obj ), strmake( "d$(datadir)/%s", obj ));
 }