Module: wine Branch: master Commit: f0ee51026b723d74b36626074f1860e80f54ad68 URL: https://gitlab.winehq.org/wine/wine/-/commit/f0ee51026b723d74b36626074f1860e...
Author: Alexandre Julliard julliard@winehq.org Date: Mon Jun 24 13:47:08 2024 +0200
makefiles: Hardcode the nls directory.
It's Wine-specific anyway.
---
configure | 4 ---- configure.ac | 1 - server/Makefile.in | 2 +- tools/makedep.c | 4 ++-- tools/wmc/Makefile.in | 4 ++-- tools/wrc/Makefile.in | 4 ++-- 6 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/configure b/configure index 26b537c2088..460701f00ed 100755 --- a/configure +++ b/configure @@ -868,7 +868,6 @@ CFLAGS CC SET_MAKE srcdir -nlsdir dlldir host_os host_vendor @@ -4677,8 +4676,6 @@ case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
dlldir=${libdir}/wine
-nlsdir=${datadir}/wine/nls -
@@ -23979,7 +23976,6 @@ host_cpu = $host_cpu host_vendor = $host_vendor host_os = $host_os dlldir = $dlldir -nlsdir = $nlsdir srcdir = $srcdir SET_MAKE = $SET_MAKE CC = $CC diff --git a/configure.ac b/configure.ac index ac0f3ea051d..745f703709f 100644 --- a/configure.ac +++ b/configure.ac @@ -92,7 +92,6 @@ 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(nlsdir,[${datadir}/wine/nls]) AC_SUBST(srcdir)
dnl **** Check for some programs **** diff --git a/server/Makefile.in b/server/Makefile.in index 7b46b924c46..8ba6baf0c30 100644 --- a/server/Makefile.in +++ b/server/Makefile.in @@ -49,4 +49,4 @@ SOURCES = \
UNIX_LIBS = $(LDEXECFLAGS) $(RT_LIBS) $(INOTIFY_LIBS) $(PROCSTAT_LIBS)
-unicode_EXTRADEFS = -DNLSDIR=""${nlsdir}"" -DBIN_TO_NLSDIR="`${MAKEDEP} -R ${bindir} ${nlsdir}`" +unicode_EXTRADEFS = -DNLSDIR=""${datadir}/wine/nls"" -DBIN_TO_NLSDIR="`${MAKEDEP} -R ${bindir} ${datadir}/wine/nls`" diff --git a/tools/makedep.c b/tools/makedep.c index 61e30ed89a6..2b24c9584a3 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2664,7 +2664,7 @@ static struct strarray get_removable_dirs( struct strarray files ) static void output_uninstall_rules( struct makefile *make ) { static const char *dirs_order[] = - { "$(includedir)", "$(mandir)", "$(nlsdir)", "$(datadir)", "$(dlldir)" }; + { "$(includedir)", "$(mandir)", "$(datadir)", "$(dlldir)" };
struct strarray uninstall_dirs; unsigned int i, j; @@ -3042,7 +3042,7 @@ static void output_source_svg( struct makefile *make, struct incl_file *source, static void output_source_nls( struct makefile *make, struct incl_file *source, const char *obj ) { add_install_rule( make, source->name, 0, source->name, - strmake( "D$(nlsdir)/%s", source->name )); + strmake( "D$(datadir)/wine/nls/%s", source->name )); output_srcdir_symlink( make, strmake( "%s.nls", obj )); }
diff --git a/tools/wmc/Makefile.in b/tools/wmc/Makefile.in index 022315c8ce1..1c2c72360b7 100644 --- a/tools/wmc/Makefile.in +++ b/tools/wmc/Makefile.in @@ -12,7 +12,7 @@ SOURCES = \ write.c
wmc_EXTRADEFS = \ - -DNLSDIR=""${nlsdir}"" \ - -DBIN_TO_NLSDIR="`${MAKEDEP} -R ${bindir} ${nlsdir}`" + -DNLSDIR=""${datadir}/wine/nls"" \ + -DBIN_TO_NLSDIR="`${MAKEDEP} -R ${bindir} ${datadir}/wine/nls`"
INSTALL_DEV = $(PROGRAMS) diff --git a/tools/wrc/Makefile.in b/tools/wrc/Makefile.in index 06547d2b851..54cde2e98fd 100644 --- a/tools/wrc/Makefile.in +++ b/tools/wrc/Makefile.in @@ -15,9 +15,9 @@ SOURCES = \ wrc.man.in
wrc_EXTRADEFS = \ - -DNLSDIR=""${nlsdir}"" \ + -DNLSDIR=""${datadir}/wine/nls"" \ -DINCLUDEDIR=""${includedir}"" \ - -DBIN_TO_NLSDIR="`${MAKEDEP} -R ${bindir} ${nlsdir}`" \ + -DBIN_TO_NLSDIR="`${MAKEDEP} -R ${bindir} ${datadir}/wine/nls`" \ -DBIN_TO_INCLUDEDIR="`${MAKEDEP} -R ${bindir} ${includedir}`"
INSTALL_DEV = $(PROGRAMS)