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@winehq.org>

makefiles: Move wine.desktop to the loader directory.
2207a890 · Alexandre Julliard · 581be47a · 2207a890 · 2207a890 · 2207a890
Commit 2207a890 authored Oct 26, 2015 by Alexandre Julliard
Hide whitespace changes
Inline Side-by-side

Showing with 22 additions and 7 deletions

configure configure +10 -1

configure.ac configure.ac +10 -1

wine.desktop loader/wine.desktop +0 -0

Makefile.in tools/Makefile.in +2 -5

No files found.
--- 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

--- 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])

--- a/tools/wine.desktop
+++ b/tools/wine.desktop
--- 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