From: Rémi Bernon rbernon@codeweavers.com
DATADIR is used in objidl and will cause compilation errors when d3d headers are included on the unix side. --- dlls/ntdll/Makefile.in | 2 +- dlls/ntdll/unix/loader.c | 2 +- server/Makefile.in | 2 +- server/unicode.c | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/dlls/ntdll/Makefile.in b/dlls/ntdll/Makefile.in index f7558bb5d86..975c50d0050 100644 --- a/dlls/ntdll/Makefile.in +++ b/dlls/ntdll/Makefile.in @@ -77,5 +77,5 @@ EXTRA_OBJS = unix/version.o unix_loader_EXTRADEFS = \ -DBINDIR="${bindir}" \ -DLIBDIR="${libdir}" \ - -DDATADIR="${datadir}" \ + -DSHAREDIR="${datadir}" \ -DSYSTEMDLLPATH="${system_dllpath}" diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 3208499a59b..bad01406bd0 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -462,7 +462,7 @@ static void init_paths(void) { if (!(dll_dir = remove_tail( ntdll_dir, get_so_dir(current_machine) ))) dll_dir = ntdll_dir; bin_dir = build_relative_path( dll_dir, LIBDIR "/wine", BINDIR ); - data_dir = build_relative_path( dll_dir, LIBDIR "/wine", DATADIR "/wine" ); + data_dir = build_relative_path( dll_dir, LIBDIR "/wine", SHAREDIR "/wine" ); wineloader = build_path( ntdll_dir, "wine" ); }
diff --git a/server/Makefile.in b/server/Makefile.in index d3d50b9aa5a..55548e6cd58 100644 --- a/server/Makefile.in +++ b/server/Makefile.in @@ -52,4 +52,4 @@ SOURCES = \ UNIX_CFLAGS = $(INOTIFY_CFLAGS) UNIX_LIBS = $(LDEXECFLAGS) $(RT_LIBS) $(INOTIFY_LIBS) $(PROCSTAT_LIBS)
-unicode_EXTRADEFS = -DBINDIR=""${bindir}"" -DDATADIR=""${datadir}"" +unicode_EXTRADEFS = -DBINDIR=""${bindir}"" -DSHAREDIR=""${datadir}"" diff --git a/server/unicode.c b/server/unicode.c index bb39b55e50c..e759e284135 100644 --- a/server/unicode.c +++ b/server/unicode.c @@ -319,7 +319,7 @@ static char *get_nls_dir(void) strcpy( p - 8, "/nls" ); return dir; } - ret = build_relative_path( dir, BINDIR, DATADIR "/wine/nls" ); + ret = build_relative_path( dir, BINDIR, SHAREDIR "/wine/nls" ); free( dir ); return ret; } @@ -327,7 +327,7 @@ static char *get_nls_dir(void) /* load the case mapping table */ struct fd *load_intl_file(void) { - static const char *nls_dirs[] = { NULL, DATADIR "/wine/nls", "/usr/local/share/wine/nls", "/usr/share/wine/nls" }; + static const char *nls_dirs[] = { NULL, SHAREDIR "/wine/nls", "/usr/local/share/wine/nls", "/usr/share/wine/nls" }; static const WCHAR nt_pathW[] = {'C',':','\','w','i','n','d','o','w','s','\', 's','y','s','t','e','m','3','2','\','l','_','i','n','t','l','.','n','l','s',0}; static const struct unicode_str nt_name = { nt_pathW, sizeof(nt_pathW) };