Module: wine Branch: master Commit: 0fb9e616bcfb4ba25f29f96dfbfd9f88d90ddeb5 URL: https://gitlab.winehq.org/wine/wine/-/commit/0fb9e616bcfb4ba25f29f96dfbfd9f8...
Author: Alexandre Julliard julliard@winehq.org Date: Mon Jun 24 13:57:34 2024 +0200
makefiles: Hardcode the dll directory.
It's Wine-specific anyway.
---
configure | 6 +----- configure.ac | 3 +-- dlls/ntdll/Makefile.in | 2 +- loader/Makefile.in | 2 +- tools/makedep.c | 10 +++++----- tools/widl/Makefile.in | 4 ++-- 6 files changed, 11 insertions(+), 16 deletions(-)
diff --git a/configure b/configure index 460701f00ed..64afddd6a51 100755 --- a/configure +++ b/configure @@ -868,7 +868,6 @@ CFLAGS CC SET_MAKE srcdir -dlldir host_os host_vendor host_cpu @@ -4674,8 +4673,6 @@ case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
-dlldir=${libdir}/wine -
@@ -6470,7 +6467,7 @@ MAKEDEP=$wine_makedep
RUNTESTFLAGS="-q -P wine"
-SED_CMD="LC_ALL=C sed -e 's,@bindir@,${bindir},g' -e 's,@dlldir@,${dlldir},g' -e 's,@PACKAGE_STRING@,$PACKAGE_STRING,g' -e 's,@PACKAGE_VERSION@,$PACKAGE_VERSION,g'" +SED_CMD="LC_ALL=C sed -e 's,@bindir@,${bindir},g' -e 's,@PACKAGE_STRING@,$PACKAGE_STRING,g' -e 's,@PACKAGE_VERSION@,$PACKAGE_VERSION,g'"
if test -n "$host_alias" -a "$host_alias" != "$build_alias" @@ -23975,7 +23972,6 @@ host = $host host_cpu = $host_cpu host_vendor = $host_vendor host_os = $host_os -dlldir = $dlldir srcdir = $srcdir SET_MAKE = $SET_MAKE CC = $CC diff --git a/configure.ac b/configure.ac index 745f703709f..8c2f0f3e09b 100644 --- a/configure.ac +++ b/configure.ac @@ -91,7 +91,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(srcdir)
dnl **** Check for some programs **** @@ -196,7 +195,7 @@ fi AC_SUBST(toolsdir,[$wine_cv_toolsdir]) AC_SUBST(MAKEDEP,[$wine_makedep]) AC_SUBST(RUNTESTFLAGS,["-q -P wine"]) -AC_SUBST(SED_CMD,["LC_ALL=C sed -e 's,@bindir@,${bindir},g' -e 's,@dlldir@,${dlldir},g' -e 's,@PACKAGE_STRING@,$PACKAGE_STRING,g' -e 's,@PACKAGE_VERSION@,$PACKAGE_VERSION,g'"]) +AC_SUBST(SED_CMD,["LC_ALL=C sed -e 's,@bindir@,${bindir},g' -e 's,@PACKAGE_STRING@,$PACKAGE_STRING,g' -e 's,@PACKAGE_VERSION@,$PACKAGE_VERSION,g'"])
if test -n "$host_alias" -a "$host_alias" != "$build_alias" then diff --git a/dlls/ntdll/Makefile.in b/dlls/ntdll/Makefile.in index b519bcd655f..e17e3f72b92 100644 --- a/dlls/ntdll/Makefile.in +++ b/dlls/ntdll/Makefile.in @@ -76,5 +76,5 @@ EXTRA_OBJS = unix/version.o unix_loader_EXTRADEFS = \ -DBINDIR="${bindir}" \ -DSYSTEMDLLPATH="${system_dllpath}" \ - -DDLL_TO_BINDIR="`${MAKEDEP} -R ${dlldir} ${bindir}`" \ + -DDLL_TO_BINDIR="`${MAKEDEP} -R ${libdir}/wine ${bindir}`" \ -DBIN_TO_DATADIR="`${MAKEDEP} -R ${bindir} ${datadir}/wine`" diff --git a/loader/Makefile.in b/loader/Makefile.in index 30413fc8677..5a9fdabfd97 100644 --- a/loader/Makefile.in +++ b/loader/Makefile.in @@ -16,7 +16,7 @@ UNIX_CFLAGS = -fPIE
preloader_EXTRADEFS = -fno-builtin
-main_EXTRADEFS = -DDLLDIR="${dlldir}" -DBIN_TO_DLLDIR="`${MAKEDEP} -R ${bindir} ${dlldir}`" +main_EXTRADEFS = -DDLLDIR="${libdir}/wine" -DBIN_TO_DLLDIR="`${MAKEDEP} -R ${bindir} ${libdir}/wine`"
wine_OBJS = main.o wine_DEPS = $(WINELOADER_DEPENDS) diff --git a/tools/makedep.c b/tools/makedep.c index 2b24c9584a3..cf22bc7bf07 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)", "$(datadir)", "$(dlldir)" }; + { "$(includedir)", "$(mandir)", "$(datadir)" };
struct strarray uninstall_dirs; unsigned int i, j; @@ -3383,7 +3383,7 @@ static void output_fake_module( struct makefile *make, const char *spec_file ) if (make->disabled[arch]) return;
strarray_add( &make->all_targets[arch], name ); - add_install_rule( make, make->module, arch, name, strmake( "d$(dlldir)/%s", name )); + add_install_rule( make, make->module, arch, name, strmake( "d$(libdir)/wine/%s", name ));
output( "%s:", obj_dir_path( make, name )); if (spec_file) output_filename( spec_file ); @@ -3460,7 +3460,7 @@ static void output_module( struct makefile *make, unsigned int arch ) strarray_add( &make->all_targets[link_arch], module_name ); if (make->data_only) add_install_rule( make, make->module, link_arch, module_name, - strmake( "d$(dlldir)/%s%s", arch_pe_dirs[arch], make->module )); + strmake( "d$(libdir)/wine/%s%s", arch_pe_dirs[arch], make->module )); else add_install_rule( make, make->module, link_arch, module_name, strmake( "%c%s%s%s", '0' + arch, arch_install_dirs[arch], make->module, @@ -4554,7 +4554,7 @@ int main( int argc, char *argv[] )
arch_dirs[0] = ""; arch_pe_dirs[0] = strmake( "%s-windows/", archs.str[0] ); - arch_install_dirs[0] = unix_lib_supported ? strmake( "$(dlldir)/%s-unix/", archs.str[0] ) : "$(dlldir)/"; + arch_install_dirs[0] = unix_lib_supported ? strmake( "$(libdir)/wine/%s-unix/", archs.str[0] ) : "$(libdir)/wine/"; strip_progs[0] = ""$(STRIP)"";
for (arch = 1; arch < archs.count; arch++) @@ -4564,7 +4564,7 @@ int main( int argc, char *argv[] ) strarray_add( &target_flags[arch], target ); arch_dirs[arch] = strmake( "%s-windows/", archs.str[arch] ); arch_pe_dirs[arch] = arch_dirs[arch]; - arch_install_dirs[arch] = strmake( "$(dlldir)/%s", arch_dirs[arch] ); + arch_install_dirs[arch] = strmake( "$(libdir)/wine/%s", arch_dirs[arch] ); strip_progs[arch] = strmake( "%s-strip", target ); dll_ext[arch] = ""; } diff --git a/tools/widl/Makefile.in b/tools/widl/Makefile.in index da6d843b2a8..fee965d49db 100644 --- a/tools/widl/Makefile.in +++ b/tools/widl/Makefile.in @@ -26,8 +26,8 @@ SOURCES = \
widl_EXTRADEFS = \ -DINCLUDEDIR=""${includedir}"" \ - -DDLLDIR=""${dlldir}"" \ + -DDLLDIR=""${libdir}/wine"" \ -DBIN_TO_INCLUDEDIR="`${MAKEDEP} -R ${bindir} ${includedir}`" \ - -DBIN_TO_DLLDIR="`${MAKEDEP} -R ${bindir} ${dlldir}`" + -DBIN_TO_DLLDIR="`${MAKEDEP} -R ${bindir} ${libdir}/wine`"
INSTALL_DEV = $(PROGRAMS)