From 0f298433d72decfde2196c0c0839d9af7956bd11 Mon Sep 17 00:00:00 2001 From: Martin Wilck Date: Tue, 17 Sep 2002 18:31:31 +0000 Subject: [PATCH] Fix "install" and "uninstall" targets: .exe -> .exe.so; target dir is $(dlldir), like for the "builtin" wine binaries. --- tools/winemaker | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/winemaker b/tools/winemaker index d8a7977e78c..0af64f512ad 100755 --- a/tools/winemaker +++ b/tools/winemaker @@ -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"; } 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)\"; for i in \$\$_list; do \$(INSTALL_SCRIPT) \$\$i \$(bindir); done\n"; + print FILEO "\t_list=\"\$(EXES:%=%.so)\"; for i in \$\$_list; do \$(INSTALL_PROGRAM) \$\$i \$(dlldir); done\n"; print FILEO "\t_list=\"\$(DLLS)\"; for i in \$\$_list; do \$(INSTALL_PROGRAM) \$\$i \$(libdir); done\n"; } print FILEO "\n"; @@ -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"; } 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)\"; for i in \$\$_list; do \$(RM) \$(bindir)/\$\$i;done\n"; + print FILEO "\t_list=\"\$(EXES:%=%.so)\"; for i in \$\$_list; do \$(RM) \$(dlldir)/\$\$i;done\n"; print FILEO "\t_list=\"\$(DLLS)\"; for i in \$\$_list; do \$(RM) \$(libdir)/\$\$i;done\n"; } print FILEO "\n"; @@ -3119,6 +3117,8 @@ bindir = @bindir@ libdir = @libdir@ infodir = @infodir@ mandir = @mandir@ +dlldir = @libdir@/wine + prog_manext = 1 conf_manext = 5