| Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame^] | 1 | Backport two patches from upstream to fix parallel builds |
| 2 | |
| 3 | - mkdir races (2eff22b8e6f6e5255a1915c33dfd91cecf02cbbc) |
| 4 | - weston.desktop race (315476fa7b1f1c44c1b35116036df54ac5cb9a03) |
| 5 | |
| 6 | Upstream-Status: Backport |
| 7 | Signed-off-by: Ross Burton <ross.burton@intel.com> |
| 8 | |
| 9 | diff --git a/Makefile.am b/Makefile.am |
| 10 | index 5819b19..ff13b19 100644 |
| 11 | --- a/Makefile.am |
| 12 | +++ b/Makefile.am |
| 13 | @@ -20,7 +20,7 @@ weston.ini : $(srcdir)/weston.ini.in |
| 14 | $< > $@ |
| 15 | |
| 16 | ivi-shell/weston.ini : $(srcdir)/ivi-shell/weston.ini.in |
| 17 | - $(AM_V_GEN)$(SED) \ |
| 18 | + $(AM_V_GEN)$(MKDIR_P) $(dir $@) && $(SED) \ |
| 19 | -e 's|@bindir[@]|$(bindir)|g' \ |
| 20 | -e 's|@abs_top_builddir[@]|$(abs_top_builddir)|g' \ |
| 21 | -e 's|@abs_top_srcdir[@]|$(abs_top_srcdir)|g' \ |
| 22 | @@ -29,7 +29,7 @@ ivi-shell/weston.ini : $(srcdir)/ivi-shell/weston.ini.in |
| 23 | $< > $@ |
| 24 | |
| 25 | tests/weston-ivi.ini : $(srcdir)/ivi-shell/weston.ini.in |
| 26 | - $(AM_V_GEN)$(SED) \ |
| 27 | + $(AM_V_GEN)$(MKDIR_P) $(dir $@) && $(SED) \ |
| 28 | -e 's|@bindir[@]|$(bindir)|g' \ |
| 29 | -e 's|@abs_top_builddir[@]|$(abs_top_builddir)|g' \ |
| 30 | -e 's|@abs_top_srcdir[@]|$(abs_top_srcdir)|g' \ |
| 31 | @@ -179,8 +179,7 @@ pkgconfigdir = $(libdir)/pkgconfig |
| 32 | pkgconfig_DATA = src/weston.pc |
| 33 | |
| 34 | wayland_sessiondir = $(datadir)/wayland-sessions |
| 35 | -wayland_session_DATA = src/weston.desktop |
| 36 | -dist_wayland_session_DATA = $(wayland_session_DATA) |
| 37 | +dist_wayland_session_DATA = src/weston.desktop |
| 38 | |
| 39 | westonincludedir = $(includedir)/weston |
| 40 | westoninclude_HEADERS = \ |