From 315476fa7b1f1c44c1b35116036df54ac5cb9a03 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Thu, 16 Jul 2015 20:56:32 +0100 Subject: [PATCH] build: don't duplicate rule for weston.desktop dist_wayland_session_DATA will distribute and install src/weston.desktop, so the definition of wayland_session_DATA which also installs src/weston.desktop will result in the file being installed twice and (rarely) cause install to fail. Spotted and fix by Roy Li . Signed-off-by: Ross Burton Reviewed-By: Derek Foreman --- Makefile.am | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index f71587f52..d7b45a84d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -182,8 +182,7 @@ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = src/weston.pc wayland_sessiondir = $(datadir)/wayland-sessions -wayland_session_DATA = src/weston.desktop -dist_wayland_session_DATA = $(wayland_session_DATA) +dist_wayland_session_DATA = src/weston.desktop westonincludedir = $(includedir)/weston westoninclude_HEADERS = \