Module: wine Branch: master Commit: 2292b06281286cacfd9b037b8907ff2f6bf65975 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2292b06281286cacfd9b037b89...
Author: Alexandre Julliard julliard@winehq.org Date: Mon Oct 7 12:07:04 2013 +0200
makefiles: Move l_intl.nls and wine.inf to loader so that they are installed even when tools are not built.
---
.gitignore | 2 +- configure | 21 +++++++++++++++------ configure.ac | 15 +++++++++++++-- loader/Makefile.in | 2 ++ {tools => loader}/l_intl.nls | Bin 6086 -> 6086 bytes {tools => loader}/wine.inf.in | 2 +- programs/wineboot/wineboot.c | 4 ++-- tools/Makefile.in | 13 ++----------- tools/make_unicode | 2 +- 9 files changed, 37 insertions(+), 24 deletions(-)
diff --git a/.gitignore b/.gitignore index aa64a29..f7e8b2b 100644 --- a/.gitignore +++ b/.gitignore @@ -282,6 +282,7 @@ libs/wpp/ppy.tab.h loader/wine loader/wine-installed loader/wine-preloader +loader/wine.inf loader/wine64 loader/wine64-preloader loader/wine_info.plist @@ -315,7 +316,6 @@ tools/widl/parser.tab.c tools/widl/parser.tab.h tools/widl/parser.yy.c tools/widl/widl -tools/wine.inf tools/wineapploader tools/winebuild/winebuild tools/winedump/winedump diff --git a/configure b/configure index 102bca4..24ed2a8 100755 --- a/configure +++ b/configure @@ -16607,12 +16607,10 @@ ac_config_links="$ac_config_links fonts/tahoma.ttf:fonts/tahoma.ttf" ac_config_links="$ac_config_links fonts/tahomabd.ttf:fonts/tahomabd.ttf" test "$srcdir" = "." || wine_fn_config_symlink fonts/marlett.ttf fonts/symbol.ttf fonts/tahoma.ttf fonts/tahomabd.ttf fi +ac_config_links="$ac_config_links loader/l_intl.nls:loader/l_intl.nls" +test "$srcdir" = "." || wine_fn_config_symlink loader/l_intl.nls ac_config_links="$ac_config_links po/LINGUAS:po/LINGUAS" test "$srcdir" = "." || wine_fn_config_symlink po/LINGUAS -if test "x$enable_tools" != xno; then -ac_config_links="$ac_config_links tools/l_intl.nls:tools/l_intl.nls" -test "$srcdir" = "." || wine_fn_config_symlink tools/l_intl.nls -fi ac_config_links="$ac_config_links wine:tools/winewrapper" wine_fn_config_symlink wine if test "x$enable_win64" != xno; then @@ -17490,7 +17488,18 @@ clean:: $(RM) fonts server tools $with_wine64/loader/wine $with_wine64/loader/wine-preloader" else as_fn_append LOADER_RULES " -install install-lib:: install-man-pages" +all: wine.inf + +wine.inf: wine.inf.in $(top_builddir)/include/config.h + LC_ALL=C sed -e 's,@PACKAGE_STRING@,$PACKAGE_STRING,g' $(srcdir)/wine.inf.in >$@ || ($(RM) $@ && false) + +install install-lib:: wine.inf $(DESTDIR)$(datadir)/wine install-man-pages + $(INSTALL_DATA) wine.inf $(DESTDIR)$(datadir)/wine/wine.inf + $(INSTALL_DATA) $(srcdir)/l_intl.nls $(DESTDIR)$(datadir)/wine/l_intl.nls + +uninstall:: + $(RM) $(DESTDIR)$(datadir)/wine/wine.inf $(DESTDIR)$(datadir)/wine/l_intl.nls +" fi
$as_echo " done" >&6 @@ -18213,8 +18222,8 @@ do "fonts/symbol.ttf") CONFIG_LINKS="$CONFIG_LINKS fonts/symbol.ttf:fonts/symbol.ttf" ;; "fonts/tahoma.ttf") CONFIG_LINKS="$CONFIG_LINKS fonts/tahoma.ttf:fonts/tahoma.ttf" ;; "fonts/tahomabd.ttf") CONFIG_LINKS="$CONFIG_LINKS fonts/tahomabd.ttf:fonts/tahomabd.ttf" ;; + "loader/l_intl.nls") CONFIG_LINKS="$CONFIG_LINKS loader/l_intl.nls:loader/l_intl.nls" ;; "po/LINGUAS") CONFIG_LINKS="$CONFIG_LINKS po/LINGUAS:po/LINGUAS" ;; - "tools/l_intl.nls") CONFIG_LINKS="$CONFIG_LINKS tools/l_intl.nls:tools/l_intl.nls" ;; "wine") CONFIG_LINKS="$CONFIG_LINKS wine:tools/winewrapper" ;; "wine64") CONFIG_LINKS="$CONFIG_LINKS wine64:tools/winewrapper" ;; "dlls/gdi32/dibdrv") CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/gdi32/dibdrv" ;; diff --git a/configure.ac b/configure.ac index 5ce589f..a508f8b 100644 --- a/configure.ac +++ b/configure.ac @@ -2619,8 +2619,8 @@ Makefile: Makefile.in Make.vars.in Make.rules config.status WINE_CONFIG_SYMLINK(dlls/shell32,,[AUTHORS]) WINE_CONFIG_SYMLINK(dlls/wineps.drv,dlls/wineps.drv,[generic.ppd]) WINE_CONFIG_SYMLINK(fonts,fonts,[marlett.ttf,symbol.ttf,tahoma.ttf,tahomabd.ttf],enable_fonts) +WINE_CONFIG_SYMLINK(loader,loader,[l_intl.nls]) WINE_CONFIG_SYMLINK(po,po,[LINGUAS]) -WINE_CONFIG_SYMLINK(tools,tools,[l_intl.nls],enable_tools) WINE_CONFIG_SYMLINK(,tools,[wine],,winewrapper) WINE_CONFIG_SYMLINK(,tools,[wine64],enable_win64,winewrapper)
@@ -3467,7 +3467,18 @@ clean:: $(RM) fonts server tools $with_wine64/loader/wine $with_wine64/loader/wine-preloader]) else AS_VAR_APPEND([LOADER_RULES],[" -install install-lib:: install-man-pages"]) +all: wine.inf + +wine.inf: wine.inf.in $(top_builddir)/include/config.h + LC_ALL=C sed -e 's,@PACKAGE_STRING@,$PACKAGE_STRING,g' $(srcdir)/wine.inf.in >$@ || ($(RM) $@ && false) + +install install-lib:: wine.inf $(DESTDIR)$(datadir)/wine install-man-pages + $(INSTALL_DATA) wine.inf $(DESTDIR)$(datadir)/wine/wine.inf + $(INSTALL_DATA) $(srcdir)/l_intl.nls $(DESTDIR)$(datadir)/wine/l_intl.nls + +uninstall:: + $(RM) $(DESTDIR)$(datadir)/wine/wine.inf $(DESTDIR)$(datadir)/wine/l_intl.nls +"]) fi
AS_ECHO(" done") >&AS_MESSAGE_FD diff --git a/loader/Makefile.in b/loader/Makefile.in index e5a6982..450655a 100644 --- a/loader/Makefile.in +++ b/loader/Makefile.in @@ -9,6 +9,7 @@ PROGRAMS = \ wine \ wine-installed \ wine-preloader \ + wine.inf \ wine_info.plist \ wine64 \ wine64-preloader @@ -22,6 +23,7 @@ EXTRA_MANPAGES = \
INSTALLDIRS = \ $(DESTDIR)$(bindir) \ + $(DESTDIR)$(datadir)/wine \ $(DESTDIR)$(mandir)/man$(prog_manext) \ $(DESTDIR)$(mandir)/de.UTF-8/man$(prog_manext) \ $(DESTDIR)$(mandir)/fr.UTF-8/man$(prog_manext) \ diff --git a/tools/l_intl.nls b/loader/l_intl.nls similarity index 100% rename from tools/l_intl.nls rename to loader/l_intl.nls diff --git a/tools/wine.inf.in b/loader/wine.inf.in similarity index 99% rename from tools/wine.inf.in rename to loader/wine.inf.in index 357b35c..1cefe01 100644 --- a/tools/wine.inf.in +++ b/loader/wine.inf.in @@ -161,7 +161,7 @@ HKCR,.hlp,,2,"hlpfile" HKCR,.inf,,2,"inffile" HKCR,.ini,,2,"inifile" HKCR,.lnk,,2,"lnkfile" -HKCR,.msi,,2,"Msi.Package" +HKCR,.msi,,2,"Msi.Package" HKCR,.msp,,2,"Msi.Patch" HKCR,.rtf,,2,"rtffile" HKCR,.wri,,2,"wrifile" diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index b8512e3..4f9adb0 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -108,10 +108,10 @@ static char *get_wine_inf_path(void) } else if ((build_dir = wine_get_build_dir())) { - if (!(name = HeapAlloc( GetProcessHeap(), 0, strlen(build_dir) + sizeof("/tools/wine.inf") ))) + if (!(name = HeapAlloc( GetProcessHeap(), 0, strlen(build_dir) + sizeof("/loader/wine.inf") ))) return NULL; strcpy( name, build_dir ); - strcat( name, "/tools/wine.inf" ); + strcat( name, "/loader/wine.inf" ); } return name; } diff --git a/tools/Makefile.in b/tools/Makefile.in index 02feee9..17d70f2 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -8,7 +8,6 @@ PROGRAMS = \ make_xftmpl$(EXEEXT) \ relpath$(EXEEXT) \ sfnt2fnt$(EXEEXT) \ - wine.inf \ wineapploader
MANPAGE = winemaker.man @@ -30,7 +29,6 @@ EXTRASUBDIRS = winapi INSTALLDIRS = \ $(DESTDIR)$(bindir) \ $(DESTDIR)$(datadir)/applications \ - $(DESTDIR)$(datadir)/wine \ $(DESTDIR)$(mandir)/man$(prog_manext) \ $(DESTDIR)$(mandir)/de.UTF-8/man$(prog_manext) \ $(DESTDIR)$(mandir)/fr.UTF-8/man$(prog_manext) @@ -59,15 +57,10 @@ relpath$(EXEEXT): relpath.o sfnt2fnt$(EXEEXT): sfnt2fnt.o relpath$(EXEEXT) $(CC) $(CFLAGS) -o $@ sfnt2fnt.o $(LIBWINE_STATIC) $(LIBPORT) $(LDFLAGS) $(FREETYPELIBS)
-wine.inf: wine.inf.in - LC_ALL=C sed -e 's,@PACKAGE_STRING@,@PACKAGE_STRING@,g' $(srcdir)/wine.inf.in >$@ || ($(RM) $@ && false) - wineapploader: wineapploader.in sed -e 's,@bindir@,$(bindir),g' $(srcdir)/wineapploader.in >$@ || ($(RM) $@ && false)
-install install-lib:: wine.inf $(INSTALLDIRS) - $(INSTALL_DATA) wine.inf $(DESTDIR)$(datadir)/wine/wine.inf - $(INSTALL_DATA) $(srcdir)/l_intl.nls $(DESTDIR)$(datadir)/wine/l_intl.nls +install install-lib:: $(DESTDIR)$(datadir)/applications $(INSTALL_DATA) $(srcdir)/wine.desktop $(DESTDIR)$(datadir)/applications/wine.desktop -$(UPDATE_DESKTOP_DATABASE)
@@ -79,9 +72,7 @@ install-man-pages:: $(EXTRA_MANPAGES) $(INSTALLDIRS) $(INSTALL_DATA) winemaker.fr.man $(DESTDIR)$(mandir)/fr.UTF-8/man$(prog_manext)/winemaker.$(prog_manext)
uninstall:: - $(RM) $(DESTDIR)$(datadir)/wine/wine.inf \ - $(DESTDIR)$(datadir)/wine/l_intl.nls \ - $(DESTDIR)$(datadir)/applications/wine.desktop \ + $(RM) $(DESTDIR)$(datadir)/applications/wine.desktop \ $(DESTDIR)$(bindir)/winemaker \ $(DESTDIR)$(mandir)/de.UTF-8/man$(prog_manext)/winemaker.$(prog_manext) \ $(DESTDIR)$(mandir)/fr.UTF-8/man$(prog_manext)/winemaker.$(prog_manext) diff --git a/tools/make_unicode b/tools/make_unicode index b6b1636..1acc424 100755 --- a/tools/make_unicode +++ b/tools/make_unicode @@ -2164,7 +2164,7 @@ dump_mirroring( "dlls/usp10/mirror.c" ); dump_shaping( "dlls/usp10/shaping.c" ); dump_linebreak( "dlls/usp10/linebreak.c" ); dump_indic( "dlls/usp10/indicsyllable.c" ); -dump_intl_nls("tools/l_intl.nls"); +dump_intl_nls("loader/l_intl.nls"); dump_nameprep( "dlls/kernel32/nameprep.c" );
foreach my $file (@allfiles) { HANDLE_FILE( @{$file} ); }