ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

makefiles: Generate rules for installing l_intl.nls and wine.desktop. 

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Alexandre Julliard 2018-02-19 20:57:15 +01:00
parent 538263d0ef
commit 1a49f2e044
5 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
configure vendored
View File

@ -19463,20 +19463,11 @@ $with_wine64/loader/wine-preloader:
clean::
\$(RM) fonts server $with_wine64/loader/wine $with_wine64/loader/wine-preloader"
else
WINELOADER_INSTALL="wine.inf"
WINELOADER_INSTALL="wine.inf l_intl.nls"
wine_fn_append_rule "install install-lib::
\$(INSTALL_DATA) $srcdir/loader/l_intl.nls \$(DESTDIR)\$(datadir)/wine/l_intl.nls
.PHONY: l_intl.nls/uninstall
l_intl.nls/uninstall::
\$(RM) \$(DESTDIR)\$(datadir)/wine/l_intl.nls
__uninstall__: l_intl.nls/uninstall"
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" ;;
*) WINELOADER_INSTALL="$WINELOADER_INSTALL wine.desktop" ;;
esac
fi

15
configure.ac
View File

@ -3957,21 +3957,10 @@ $with_wine64/loader/wine-preloader:
clean::
\$(RM) fonts server $with_wine64/loader/wine $with_wine64/loader/wine-preloader])
else
AC_SUBST(WINELOADER_INSTALL,"wine.inf")
WINE_APPEND_RULE(
[install install-lib::
\$(INSTALL_DATA) $srcdir/loader/l_intl.nls \$(DESTDIR)\$(datadir)/wine/l_intl.nls
.PHONY: l_intl.nls/uninstall
l_intl.nls/uninstall::
\$(RM) \$(DESTDIR)\$(datadir)/wine/l_intl.nls
__uninstall__: l_intl.nls/uninstall])
AC_SUBST(WINELOADER_INSTALL,"wine.inf 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]) ;;
*) WINELOADER_INSTALL="$WINELOADER_INSTALL wine.desktop" ;;
esac
fi

14
loader/Makefile.in
View File

@ -1,15 +1,13 @@
C_SRCS = \
SOURCES = \
l_intl.nls \
main.c \
preloader.c
MANPAGES = \
preloader.c \
wine.de.UTF-8.man.in \
wine.desktop \
wine.fr.UTF-8.man.in \
wine.man.in \
wine.pl.UTF-8.man.in
IN_SRCS = \
wine.inf.in \
wine.man.in \
wine.pl.UTF-8.man.in \
wine_info.plist.in
PROGRAMS = $(WINELOADER_PROGRAMS)

2
tools/make_makefiles
View File

@ -435,7 +435,7 @@ sub assign_sources_to_makefiles(@)
{
next unless defined ${$make}{"TESTDLL"};
}
else
elsif ($dir ne "loader") # loader dir contains misc files
{
next;
}

22
tools/makedep.c
View File

@ -2635,6 +2635,26 @@ static void output_source_svg( struct makefile *make, struct incl_file *source,
}
/*******************************************************************
* output_source_nls
*/
static void output_source_nls( struct makefile *make, struct incl_file *source, const char *obj )
{
add_install_rule( make, source->name, source->name,
strmake( "D$(datadir)/wine/%s", source->name ));
}
/*******************************************************************
* output_source_desktop
*/
static void output_source_desktop( struct makefile *make, struct incl_file *source, const char *obj )
{
add_install_rule( make, source->name, source->name,
strmake( "D$(datadir)/applications/%s", source->name ));
}
/*******************************************************************
* output_source_po
*/
@ -2843,6 +2863,8 @@ static const struct
{ "tlb", output_source_tlb },
{ "sfd", output_source_sfd },
{ "svg", output_source_svg },
{ "nls", output_source_nls },
{ "desktop", output_source_desktop },
{ "po", output_source_po },
{ "in", output_source_in },
{ "x", output_source_x },