1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
|
description: adjust search paths for addon installers
author: Michael Gilbert <mgilbert@debian.org>
author: Jens Reyer <jre.winesim@gmail.com>
forwarded: not-needed
--- a/dlls/appwiz.cpl/addons.c
+++ b/dlls/appwiz.cpl/addons.c
@@ -194,7 +194,7 @@ static enum install_res install_from_dos
lstrcpyW( path, dir );
if (!wcsncmp( path, L"\\??\\", 4 )) path[1] = '\\'; /* change \??\ into \\?\ */
- if (len && path[len-1] != '/' && path[len-1] != '\\') path[len++] = '\\';
+ if (len && path[len-1] != '/' && path[len-1] != '\\' && path[len-1] != '-') path[len++] = '\\';
lstrcpyW( path + len, subdir );
lstrcatW( path, L"\\" );
@@ -306,12 +306,14 @@ static enum install_res install_from_def
free(dir_buf);
}
+ /* debian's DATADIR already defines the wine subdir */
if (ret == INSTALL_NEXT)
- ret = install_from_unix_file(INSTALL_DATADIR "/wine/", addon->subdir_name, addon->file_name);
+ ret = install_from_unix_file(INSTALL_DATADIR "/", addon->subdir_name, addon->file_name);
+
+ /* also, always search /usr/share/wine/ */
if (ret == INSTALL_NEXT && strcmp(INSTALL_DATADIR, "/usr/share") != 0)
ret = install_from_unix_file("/usr/share/wine/", addon->subdir_name, addon->file_name);
- if (ret == INSTALL_NEXT)
- ret = install_from_unix_file("/opt/wine/", addon->subdir_name, addon->file_name);
+
return ret;
}
|
