Alexandre Julliard : configure: Create a symlink from l_intl. nls in the build tree, and install it.
Alexandre Julliard
julliard at winehq.org
Fri May 7 09:41:13 CDT 2010
Module: wine
Branch: master
Commit: 321d3883bf07016cc14699da0bc4de3781fb8871
URL: http://source.winehq.org/git/wine.git/?a=commit;h=321d3883bf07016cc14699da0bc4de3781fb8871
Author: Alexandre Julliard <julliard at winehq.org>
Date: Thu May 6 20:51:53 2010 +0200
configure: Create a symlink from l_intl.nls in the build tree, and install it.
---
configure | 3 +++
configure.ac | 1 +
tools/Makefile.in | 8 +++++++-
3 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/configure b/configure
index 52410fb..a178112 100755
--- a/configure
+++ b/configure
@@ -14220,6 +14220,8 @@ if test "x$enable_fonts" != xno; then
ac_config_links="$ac_config_links fonts/tahomabd.ttf:fonts/tahomabd.ttf"
test "$srcdir" = "." || wine_fn_config_symlink fonts/tahomabd.ttf
fi
+ac_config_links="$ac_config_links tools/l_intl.nls:tools/l_intl.nls"
+test "$srcdir" = "." || wine_fn_config_symlink tools/l_intl.nls
ac_config_links="$ac_config_links wine:tools/winewrapper"
wine_fn_config_symlink wine
@@ -15538,6 +15540,7 @@ 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" ;;
+ "tools/l_intl.nls") CONFIG_LINKS="$CONFIG_LINKS tools/l_intl.nls:tools/l_intl.nls" ;;
"wine") CONFIG_LINKS="$CONFIG_LINKS wine:tools/winewrapper" ;;
"dlls/gdi32/enhmfdrv") CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/gdi32/enhmfdrv" ;;
"dlls/gdi32/mfdrv") CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/gdi32/mfdrv" ;;
diff --git a/configure.ac b/configure.ac
index 227dee5..4224e37 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2170,6 +2170,7 @@ WINE_CONFIG_SYMLINK(fonts/marlett.ttf,,enable_fonts)
WINE_CONFIG_SYMLINK(fonts/symbol.ttf,,enable_fonts)
WINE_CONFIG_SYMLINK(fonts/tahoma.ttf,,enable_fonts)
WINE_CONFIG_SYMLINK(fonts/tahomabd.ttf,,enable_fonts)
+WINE_CONFIG_SYMLINK(tools/l_intl.nls)
WINE_CONFIG_SYMLINK(wine,tools/winewrapper)
WINE_CONFIG_EXTRA_DIR(dlls/gdi32/enhmfdrv)
diff --git a/tools/Makefile.in b/tools/Makefile.in
index 39209f9..447ab62 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -70,6 +70,7 @@ wineapploader: wineapploader.in
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_DATA) $(SRCDIR)/wine.desktop $(DESTDIR)$(datadir)/applications/wine.desktop
-$(UPDATE_DESKTOP_DATABASE)
@@ -79,7 +80,12 @@ install install-dev:: $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man$(prog_manext)
$(INSTALL_DATA) winemaker.de.man $(DESTDIR)$(mandir)/de.UTF-8/man$(prog_manext)/winemaker.$(prog_manext)
uninstall::
- $(RM) $(DESTDIR)$(bindir)/winemaker $(DESTDIR)$(mandir)/man$(prog_manext)/winemaker.$(prog_manext) $(DESTDIR)$(mandir)/de.UTF-8/man$(prog_manext)/winemaker.$(prog_manext) $(DESTDIR)$(datadir)/wine/wine.inf $(DESTDIR)$(datadir)/applications/wine.desktop
+ $(RM) $(DESTDIR)$(datadir)/wine/wine.inf \
+ $(DESTDIR)$(datadir)/wine/l_intl.nls \
+ $(DESTDIR)$(datadir)/applications/wine.desktop \
+ $(DESTDIR)$(bindir)/winemaker \
+ $(DESTDIR)$(mandir)/man$(prog_manext)/winemaker.$(prog_manext) \
+ $(DESTDIR)$(mandir)/de.UTF-8/man$(prog_manext)/winemaker.$(prog_manext)
-$(UPDATE_DESKTOP_DATABASE)
depend: makedep$(EXEEXT)
More information about the wine-cvs
mailing list