Skip to content

W
wine-winehq
Commit 0f298433 authored by Martin Wilck's avatar Martin Wilck Committed by Alexandre Julliard
Browse files
Options

Fix "install" and "uninstall" targets: .exe -> .exe.so; target dir is

$(dlldir), like for the "builtin" wine binaries.
parent 26a776e9
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
tools/winemaker
View file @ 0f298433
...@@ -1902,8 +1902,7 @@ sub generate_project_files($) ...@@ -1902,8 +1902,7 @@ sub generate_project_files($)
print FILEO "\t_list=\"\$(SUBDIRS)\"; for i in \$\$_list; do (cd \$\$i; \$(MAKE) install) || exit 1; done\n"; print FILEO "\t_list=\"\$(SUBDIRS)\"; for i in \$\$_list; do (cd \$\$i; \$(MAKE) install) || exit 1; done\n";
} }
if (@{@$project[$P_TARGETS]} > 0) { if (@{@$project[$P_TARGETS]} > 0) {
print FILEO "\t_list=\"\$(EXES:%=%.so)\"; for i in \$\$_list; do \$(INSTALL_PROGRAM) \$\$i \$(libdir); done\n"; print FILEO "\t_list=\"\$(EXES:%=%.so)\"; for i in \$\$_list; do \$(INSTALL_PROGRAM) \$\$i \$(dlldir); done\n";
print FILEO "\t_list=\"\$(EXES)\"; for i in \$\$_list; do \$(INSTALL_SCRIPT) \$\$i \$(bindir); done\n";
print FILEO "\t_list=\"\$(DLLS)\"; for i in \$\$_list; do \$(INSTALL_PROGRAM) \$\$i \$(libdir); done\n"; print FILEO "\t_list=\"\$(DLLS)\"; for i in \$\$_list; do \$(INSTALL_PROGRAM) \$\$i \$(libdir); done\n";
} }
print FILEO "\n"; print FILEO "\n";
...@@ -1914,8 +1913,7 @@ sub generate_project_files($) ...@@ -1914,8 +1913,7 @@ sub generate_project_files($)
print FILEO "\t_list=\"\$(SUBDIRS)\"; for i in \$\$_list; do (cd \$\$i; \$(MAKE) uninstall) || exit 1; done\n"; print FILEO "\t_list=\"\$(SUBDIRS)\"; for i in \$\$_list; do (cd \$\$i; \$(MAKE) uninstall) || exit 1; done\n";
} }
if (@{@$project[$P_TARGETS]} > 0) { if (@{@$project[$P_TARGETS]} > 0) {
print FILEO "\t_list=\"\$(EXES) \$(EXES:%=%.so)\"; for i in \$\$_list; do \$(RM) \$(libdir)/\$\$i;done\n"; print FILEO "\t_list=\"\$(EXES:%=%.so)\"; for i in \$\$_list; do \$(RM) \$(dlldir)/\$\$i;done\n";
print FILEO "\t_list=\"\$(EXES)\"; for i in \$\$_list; do \$(RM) \$(bindir)/\$\$i;done\n";
print FILEO "\t_list=\"\$(DLLS)\"; for i in \$\$_list; do \$(RM) \$(libdir)/\$\$i;done\n"; print FILEO "\t_list=\"\$(DLLS)\"; for i in \$\$_list; do \$(RM) \$(libdir)/\$\$i;done\n";
} }
print FILEO "\n"; print FILEO "\n";
...@@ -3119,6 +3117,8 @@ bindir = @bindir@ ...@@ -3119,6 +3117,8 @@ bindir = @bindir@
libdir = @libdir@ libdir = @libdir@
infodir = @infodir@ infodir = @infodir@
mandir = @mandir@ mandir = @mandir@
dlldir = @libdir@/wine
prog_manext = 1 prog_manext = 1
conf_manext = 5 conf_manext = 5
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment