marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

makefiles: Install source directory files from the top-level makefile. 

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
oldstable
Alexandre Julliard 2015-11-13 16:07:49 +09:00
parent b8d138d633
commit 9b71b3669e
2 changed files with 22 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
configure vendored
View File

@ -8763,15 +8763,6 @@ libwine_DEPS = wine.map
${wine_binary}_OBJS = main.o ${wine_binary}_OBJS = main.o
${wine_binary}_LDFLAGS = $LDEXECFLAGS -lwine \$(PTHREAD_LIBS) ${wine_binary}_LDFLAGS = $LDEXECFLAGS -lwine \$(PTHREAD_LIBS)
" "
if test -z "$with_wine64"
then
as_fn_append LOADER_RULES "
install install-lib::
\$(INSTALL_DATA) \$(srcdir)/wine.desktop \$(DESTDIR)\$(datadir)/applications/wine.desktop
uninstall::
\$(RM) \$(DESTDIR)\$(datadir)/applications/wine.desktop
"
fi
;; ;;
esac esac
@ -18319,13 +18310,17 @@ clean::
\$(RM) fonts server tools $with_wine64/loader/wine $with_wine64/loader/wine-preloader" \$(RM) fonts server tools $with_wine64/loader/wine $with_wine64/loader/wine-preloader"
else else
loader_install="$loader_install wine.inf" loader_install="$loader_install wine.inf"
as_fn_append LOADER_RULES " wine_fn_append_rule "install install-lib::
install install-lib:: \$(INSTALL_DATA) $srcdir/loader/l_intl.nls \$(DESTDIR)\$(datadir)/wine/l_intl.nls
\$(INSTALL_DATA) \$(srcdir)/l_intl.nls \$(DESTDIR)\$(datadir)/wine/l_intl.nls
uninstall:: uninstall::
\$(RM) \$(DESTDIR)\$(datadir)/wine/l_intl.nls \$(RM) \$(DESTDIR)\$(datadir)/wine/l_intl.nls"
" case $host_os in
cygwin*|mingw32*|darwin*|macosx*|linux-android*) ;;
*) wine_fn_append_rule "install install-lib::
\$(INSTALL_DATA) $srcdir/loader/wine.desktop \$(DESTDIR)\$(datadir)/applications/wine.desktop
uninstall::
\$(RM) \$(DESTDIR)\$(datadir)/applications/wine.desktop" ;;
esac
fi fi
as_fn_append LOADER_RULES " as_fn_append LOADER_RULES "

27
configure.ac
View File

@ -962,15 +962,6 @@ libwine_DEPS = wine.map
${wine_binary}_OBJS = main.o ${wine_binary}_OBJS = main.o
${wine_binary}_LDFLAGS = $LDEXECFLAGS -lwine \$(PTHREAD_LIBS) ${wine_binary}_LDFLAGS = $LDEXECFLAGS -lwine \$(PTHREAD_LIBS)
"]) "])
if test -z "$with_wine64"
then
AS_VAR_APPEND([LOADER_RULES],["
install install-lib::
\$(INSTALL_DATA) \$(srcdir)/wine.desktop \$(DESTDIR)\$(datadir)/applications/wine.desktop
uninstall::
\$(RM) \$(DESTDIR)\$(datadir)/applications/wine.desktop
"])
fi
;; ;;
esac esac
@ -3692,13 +3683,19 @@ clean::
\$(RM) fonts server tools $with_wine64/loader/wine $with_wine64/loader/wine-preloader]) \$(RM) fonts server tools $with_wine64/loader/wine $with_wine64/loader/wine-preloader])
else else
loader_install="$loader_install wine.inf" loader_install="$loader_install wine.inf"
AS_VAR_APPEND([LOADER_RULES],[" WINE_APPEND_RULE(
install install-lib:: [install install-lib::
\$(INSTALL_DATA) \$(srcdir)/l_intl.nls \$(DESTDIR)\$(datadir)/wine/l_intl.nls \$(INSTALL_DATA) $srcdir/loader/l_intl.nls \$(DESTDIR)\$(datadir)/wine/l_intl.nls
uninstall:: uninstall::
\$(RM) \$(DESTDIR)\$(datadir)/wine/l_intl.nls \$(RM) \$(DESTDIR)\$(datadir)/wine/l_intl.nls])
"]) case $host_os in
cygwin*|mingw32*|darwin*|macosx*|linux-android*) ;;
*) WINE_APPEND_RULE(
[install install-lib::
\$(INSTALL_DATA) $srcdir/loader/wine.desktop \$(DESTDIR)\$(datadir)/applications/wine.desktop
uninstall::
\$(RM) \$(DESTDIR)\$(datadir)/applications/wine.desktop]) ;;
esac
fi fi
AS_VAR_APPEND([LOADER_RULES],[" AS_VAR_APPEND([LOADER_RULES],["