Skip to content

W
wine-winehq
Commit 62beaad8 authored by Alexandre Julliard's avatar Alexandre Julliard
Browse files
Options

configure: Correctly install binaries even when the tools are disabled.

parent 204105ad
Hide whitespace changes
Inline Side-by-side
Showing with 14 additions and 14 deletions
aclocal.m4
View file @ 62beaad8
...@@ -557,23 +557,23 @@ __uninstall__: $ac_dir/__uninstall__" ...@@ -557,23 +557,23 @@ __uninstall__: $ac_dir/__uninstall__"
$ac_dir/__uninstall__:: $ac_dir/__uninstall__::
\$(RM) \$(DESTDIR)\$(dlldir)/$DLLPREFIX$ac_program$DLLEXT \$(DESTDIR)\$(fakedlldir)/$ac_program" \$(RM) \$(DESTDIR)\$(dlldir)/$DLLPREFIX$ac_program$DLLEXT \$(DESTDIR)\$(fakedlldir)/$ac_program"
if test "x$enable_tools" != xno && wine_fn_has_flag installbin $ac_flags if test -z "$with_wine64" && wine_fn_has_flag installbin $ac_flags
then then
wine_fn_append_rule \ wine_fn_append_rule \
"$ac_dir/__install__:: tools \$(DESTDIR)\$(bindir) "$ac_dir/__install__:: __tooldeps__ \$(DESTDIR)\$(bindir)
\$(INSTALL_SCRIPT) tools/wineapploader \$(DESTDIR)\$(bindir)/$ac_name \$(INSTALL_SCRIPT) \$(TOOLSDIR)/tools/wineapploader \$(DESTDIR)\$(bindir)/$ac_name
$ac_dir/__uninstall__:: $ac_dir/__uninstall__::
\$(RM) \$(DESTDIR)\$(bindir)/$ac_name" \$(RM) \$(DESTDIR)\$(bindir)/$ac_name"
fi fi
else else
wine_fn_append_rule \ wine_fn_append_rule \
"$ac_dir/__install-lib__:: $ac_dir \$(DESTDIR)\$(dlldir) "$ac_dir/__install__:: $ac_dir \$(DESTDIR)\$(bindir)
\$(INSTALL_PROGRAM) $ac_dir/$ac_program \$(DESTDIR)\$(dlldir)/$ac_program \$(INSTALL_PROGRAM) $ac_dir/$ac_program \$(DESTDIR)\$(bindir)/$ac_program
$ac_dir/__uninstall__:: $ac_dir/__uninstall__::
\$(RM) \$(DESTDIR)\$(dlldir)/$ac_program" \$(RM) \$(DESTDIR)\$(bindir)/$ac_program"
fi fi
if test "x$enable_tools" != xno && wine_fn_has_flag manpage $ac_flags if test -z "$with_wine64" && wine_fn_has_flag manpage $ac_flags
then then
wine_fn_append_rule \ wine_fn_append_rule \
"$ac_dir/__install__:: $ac_dir \$(DESTDIR)\$(mandir)/man\$(prog_manext) "$ac_dir/__install__:: $ac_dir \$(DESTDIR)\$(mandir)/man\$(prog_manext)
......
configure
View file @ 62beaad8
...@@ -16474,23 +16474,23 @@ __uninstall__: $ac_dir/__uninstall__" ...@@ -16474,23 +16474,23 @@ __uninstall__: $ac_dir/__uninstall__"
$ac_dir/__uninstall__:: $ac_dir/__uninstall__::
\$(RM) \$(DESTDIR)\$(dlldir)/$DLLPREFIX$ac_program$DLLEXT \$(DESTDIR)\$(fakedlldir)/$ac_program" \$(RM) \$(DESTDIR)\$(dlldir)/$DLLPREFIX$ac_program$DLLEXT \$(DESTDIR)\$(fakedlldir)/$ac_program"
if test "x$enable_tools" != xno && wine_fn_has_flag installbin $ac_flags if test -z "$with_wine64" && wine_fn_has_flag installbin $ac_flags
then then
wine_fn_append_rule \ wine_fn_append_rule \
"$ac_dir/__install__:: tools \$(DESTDIR)\$(bindir) "$ac_dir/__install__:: __tooldeps__ \$(DESTDIR)\$(bindir)
\$(INSTALL_SCRIPT) tools/wineapploader \$(DESTDIR)\$(bindir)/$ac_name \$(INSTALL_SCRIPT) \$(TOOLSDIR)/tools/wineapploader \$(DESTDIR)\$(bindir)/$ac_name
$ac_dir/__uninstall__:: $ac_dir/__uninstall__::
\$(RM) \$(DESTDIR)\$(bindir)/$ac_name" \$(RM) \$(DESTDIR)\$(bindir)/$ac_name"
fi fi
else else
wine_fn_append_rule \ wine_fn_append_rule \
"$ac_dir/__install-lib__:: $ac_dir \$(DESTDIR)\$(dlldir) "$ac_dir/__install__:: $ac_dir \$(DESTDIR)\$(bindir)
\$(INSTALL_PROGRAM) $ac_dir/$ac_program \$(DESTDIR)\$(dlldir)/$ac_program \$(INSTALL_PROGRAM) $ac_dir/$ac_program \$(DESTDIR)\$(bindir)/$ac_program
$ac_dir/__uninstall__:: $ac_dir/__uninstall__::
\$(RM) \$(DESTDIR)\$(dlldir)/$ac_program" \$(RM) \$(DESTDIR)\$(bindir)/$ac_program"
fi fi
if test "x$enable_tools" != xno && wine_fn_has_flag manpage $ac_flags if test -z "$with_wine64" && wine_fn_has_flag manpage $ac_flags
then then
wine_fn_append_rule \ wine_fn_append_rule \
"$ac_dir/__install__:: $ac_dir \$(DESTDIR)\$(mandir)/man\$(prog_manext) "$ac_dir/__install__:: $ac_dir \$(DESTDIR)\$(mandir)/man\$(prog_manext)
......
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