summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorJasper St. Pierre <jstpierre@mecheye.net>2014-04-09 15:20:56 -0700
committerJasper St. Pierre <jstpierre@mecheye.net>2014-04-09 15:24:09 -0700
commitee0c76c2b9d156c1f19aea72ca8cdbd1f123ff4f (patch)
tree3876c00cc38b330cf7b2cd7525f6b24b15fe8ac8 /data
parent6ce6e77d2ad60764fe04625eb68015594b59578e (diff)
Link to libmutter always
Wayland support was merged into mutter master.
Diffstat (limited to 'data')
-rw-r--r--data/Makefile.am6
-rw-r--r--data/gnome-shell-wayland.desktop.in.in2
2 files changed, 2 insertions, 6 deletions
diff --git a/data/Makefile.am b/data/Makefile.am
index a73affd1..46c337cc 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,9 +1,5 @@
desktopdir=$(datadir)/applications
-desktop_DATA = gnome-shell.desktop gnome-shell-extension-prefs.desktop
-if HAVE_MUTTER_WAYLAND
-desktop_DATA += gnome-shell-wayland.desktop
-endif HAVE_MUTTER_WAYLAND
-
+desktop_DATA = gnome-shell.desktop gnome-shell-wayland.desktop gnome-shell-extension-prefs.desktop
# We substitute in bindir so it works as an autostart
# file when built in a non-system prefix
diff --git a/data/gnome-shell-wayland.desktop.in.in b/data/gnome-shell-wayland.desktop.in.in
index 7b99cfb3..4c7d5a76 100644
--- a/data/gnome-shell-wayland.desktop.in.in
+++ b/data/gnome-shell-wayland.desktop.in.in
@@ -2,7 +2,7 @@
Type=Application
_Name=GNOME Shell (wayland compositor)
_Comment=Window management and application launching
-Exec=@bindir@/mutter-launch -- gnome-shell-wayland --wayland --display-server
+Exec=@bindir@/mutter-launch -- gnome-shell --wayland --display-server
X-GNOME-Bugzilla-Bugzilla=GNOME
X-GNOME-Bugzilla-Product=gnome-shell
X-GNOME-Bugzilla-Component=general