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

makefiles: Generate rules for installing wine.inf. 

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Alexandre Julliard 2015-11-13 15:16:16 +09:00
parent d1578a61ab
commit b8d138d633
3 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
configure vendored
View File

@ -7865,6 +7865,7 @@ distclean::
wine_binary="wine" wine_binary="wine"
test "x$enable_win64" != "xyes" || wine_binary="wine64" test "x$enable_win64" != "xyes" || wine_binary="wine64"
loader_programs="$wine_binary" loader_programs="$wine_binary"
loader_install=""
libwine_soversion=`expr $libwine_version : '\([0-9]*\)\..*'` libwine_soversion=`expr $libwine_version : '\([0-9]*\)\..*'`
case $host_os in case $host_os in
@ -14979,10 +14980,6 @@ ${wine_binary}_preloader_LDFLAGS = -static -nostartfiles -nodefaultlibs -Wl,-Tte
esac esac
;; ;;
esac esac
as_fn_append LOADER_RULES "
PROGRAMS = $loader_programs
INSTALL_LIB = $loader_programs
"
ac_save_CFLAGS="$CFLAGS" ac_save_CFLAGS="$CFLAGS"
@ -18321,16 +18318,21 @@ $with_wine64/loader/wine-preloader:
clean:: 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"
as_fn_append LOADER_RULES " as_fn_append LOADER_RULES "
install install-lib:: wine.inf install install-lib::
\$(INSTALL_DATA) wine.inf \$(DESTDIR)\$(datadir)/wine/wine.inf
\$(INSTALL_DATA) \$(srcdir)/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/wine.inf \$(DESTDIR)\$(datadir)/wine/l_intl.nls \$(RM) \$(DESTDIR)\$(datadir)/wine/l_intl.nls
" "
fi fi
as_fn_append LOADER_RULES "
PROGRAMS = $loader_programs
INSTALL_LIB = $loader_programs$loader_install
"
if test "$srcdir" = . if test "$srcdir" = .
then then
ac_config_commands="$ac_config_commands .gitignore" ac_config_commands="$ac_config_commands .gitignore"

16
configure.ac
View File

@ -688,6 +688,7 @@ WINE_CONFIG_HELPERS
wine_binary="wine" wine_binary="wine"
test "x$enable_win64" != "xyes" || wine_binary="wine64" test "x$enable_win64" != "xyes" || wine_binary="wine64"
loader_programs="$wine_binary" loader_programs="$wine_binary"
loader_install=""
libwine_soversion=`expr $libwine_version : '\([[0-9]]*\)\..*'` libwine_soversion=`expr $libwine_version : '\([[0-9]]*\)\..*'`
case $host_os in case $host_os in
@ -1981,10 +1982,6 @@ ${wine_binary}_preloader_LDFLAGS = -static -nostartfiles -nodefaultlibs -Wl,-Tte
esac esac
;; ;;
esac esac
AS_VAR_APPEND([LOADER_RULES],["
PROGRAMS = $loader_programs
INSTALL_LIB = $loader_programs
"])
dnl **** Check for functions **** dnl **** Check for functions ****
@ -3694,16 +3691,21 @@ $with_wine64/loader/wine-preloader:
clean:: 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"
AS_VAR_APPEND([LOADER_RULES],[" AS_VAR_APPEND([LOADER_RULES],["
install install-lib:: wine.inf install install-lib::
\$(INSTALL_DATA) wine.inf \$(DESTDIR)\$(datadir)/wine/wine.inf
\$(INSTALL_DATA) \$(srcdir)/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/wine.inf \$(DESTDIR)\$(datadir)/wine/l_intl.nls \$(RM) \$(DESTDIR)\$(datadir)/wine/l_intl.nls
"]) "])
fi fi
AS_VAR_APPEND([LOADER_RULES],["
PROGRAMS = $loader_programs
INSTALL_LIB = $loader_programs$loader_install
"])
if test "$srcdir" = . if test "$srcdir" = .
then then
AC_CONFIG_COMMANDS([.gitignore], [wine_fn_output_gitignore .gitignore], AC_CONFIG_COMMANDS([.gitignore], [wine_fn_output_gitignore .gitignore],

2
tools/makedep.c
View File

@ -2254,6 +2254,8 @@ static struct strarray output_sources( const struct makefile *make, struct strar
output( "%s:", obj_dir_path( make, obj )); output( "%s:", obj_dir_path( make, obj ));
output_filenames( dependencies ); output_filenames( dependencies );
output( "\n" ); output( "\n" );
add_install_rule( make, install_rules, obj, xstrdup( obj ),
strmake( "d$(datadir)/wine/%s", obj ));
} }
else if (!strcmp( ext, "sfd" )) /* font file */ else if (!strcmp( ext, "sfd" )) /* font file */
{ {