Alexandre Julliard : makefiles: Move wine.desktop to the loader directory.
Alexandre Julliard
julliard at wine.codeweavers.com
Mon Oct 26 09:58:34 CDT 2015
Module: wine
Branch: master
Commit: 2207a8907ca71792ab27acf9bb61efa80431ea84
URL: http://source.winehq.org/git/wine.git/?a=commit;h=2207a8907ca71792ab27acf9bb61efa80431ea84
Author: Alexandre Julliard <julliard at winehq.org>
Date: Mon Oct 26 23:03:08 2015 +0900
makefiles: Move wine.desktop to the loader directory.
Also don't install it on Mac OS X or Android.
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
configure | 11 ++++++++++-
configure.ac | 11 ++++++++++-
{tools => loader}/wine.desktop | 0
tools/Makefile.in | 7 ++-----
4 files changed, 22 insertions(+), 7 deletions(-)
diff --git a/configure b/configure
index 8d17086..508cb0b 100755
--- a/configure
+++ b/configure
@@ -8825,6 +8825,15 @@ $wine_binary: main.o
wine-installed: main.o
\$(CC) -o \$@ $LDEXECFLAGS main.o \$(LIBWINE) \$(LIBPORT) \$(EXTRALIBS) \$(LDFLAGS) \$(LDRPATH_INSTALL)
"
+ 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
@@ -18116,7 +18125,7 @@ wine_fn_config_program wusa enable_wusa install
wine_fn_config_program xcopy enable_xcopy install,po
wine_fn_config_test programs/xcopy/tests xcopy.exe_test
wine_fn_config_makefile server enable_server clean,install-lib,manpage
-wine_fn_config_tool tools clean,install-dev,install-lib,manpage
+wine_fn_config_tool tools clean,install-dev,manpage
wine_fn_config_tool tools/sfnt2fon clean
wine_fn_config_tool tools/widl clean,install-dev,manpage
wine_fn_config_tool tools/winebuild clean,install-dev,manpage
diff --git a/configure.ac b/configure.ac
index bfcf319..8bbb3f7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1039,6 +1039,15 @@ $wine_binary: main.o
wine-installed: main.o
\$(CC) -o \$@ $LDEXECFLAGS main.o \$(LIBWINE) \$(LIBPORT) \$(EXTRALIBS) \$(LDFLAGS) \$(LDRPATH_INSTALL)
"])
+ 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
@@ -3589,7 +3598,7 @@ WINE_CONFIG_PROGRAM(wusa,,[install])
WINE_CONFIG_PROGRAM(xcopy,,[install,po])
WINE_CONFIG_TEST(programs/xcopy/tests)
WINE_CONFIG_MAKEFILE([server],,[clean,install-lib,manpage])
-WINE_CONFIG_TOOL(tools,[clean,install-dev,install-lib,manpage])
+WINE_CONFIG_TOOL(tools,[clean,install-dev,manpage])
WINE_CONFIG_TOOL(tools/sfnt2fon,[clean])
WINE_CONFIG_TOOL(tools/widl,[clean,install-dev,manpage])
WINE_CONFIG_TOOL(tools/winebuild,[clean,install-dev,manpage])
diff --git a/tools/wine.desktop b/loader/wine.desktop
similarity index 100%
rename from tools/wine.desktop
rename to loader/wine.desktop
diff --git a/tools/Makefile.in b/tools/Makefile.in
index c51b8e0..0aecc9f 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -18,13 +18,10 @@ all: wineapploader
make_xftmpl$(EXEEXT): make_xftmpl.o
$(CC) $(CFLAGS) -o $@ make_xftmpl.o $(LIBPORT) $(LDFLAGS)
-.PHONY: install install-lib install-dev uninstall
-
-install install-lib::
- $(INSTALL_DATA) $(srcdir)/wine.desktop $(DESTDIR)$(datadir)/applications/wine.desktop
+.PHONY: install install-dev uninstall
install install-dev:: install-man-pages
$(INSTALL_SCRIPT) $(srcdir)/winemaker $(DESTDIR)$(bindir)/winemaker
uninstall::
- $(RM) $(DESTDIR)$(datadir)/applications/wine.desktop $(DESTDIR)$(bindir)/winemaker
+ $(RM) $(DESTDIR)$(bindir)/winemaker
More information about the wine-cvs
mailing list