[PATCH][weston] build: don't duplicate rule for weston.desktop

Ross Burton ross.burton at intel.com
Thu Jul 16 12:56:32 PDT 2015


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 <rongqing.li at windriver.com>.
Signed-off-by: Ross Burton <ross.burton at intel.com>
---
 Makefile.am | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index f71587f..d7b45a8 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 =				\
-- 
2.1.4



More information about the wayland-devel mailing list