On Thu, Jul 16, 2015 at 08:56:32PM +0100, Ross Burton wrote: > 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...@windriver.com>. > Signed-off-by: Ross Burton <ross.bur...@intel.com>
Thanks, pushed: To ssh://git.freedesktop.org/git/wayland/weston 2217f3f..315476f master -> master > --- > 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 > > _______________________________________________ > wayland-devel mailing list > wayland-devel@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/wayland-devel _______________________________________________ wayland-devel mailing list wayland-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/wayland-devel
