[PATCH][V3][weston] build: mkdir target weston.ini directories before writing
Bryce Harrington
bryce at osg.samsung.com
Thu Jul 23 18:02:06 PDT 2015
On Fri, Jul 17, 2015 at 01:45:00PM +0200, Quentin Glidic wrote:
> On 2015-07-17 13:33, Ross Burton wrote:
> > In parallel out-of-tree builds it is possible for e.g. ivi-shell/weston.ini to
> > be written before ivi-shell/ exists. Solve this by creating the target
> > directory first.
> >
> > Signed-off-by: Ross Burton <ross.burton at intel.com>
> > ---
> > Makefile.am | 4 ++--
> > 1 file changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/Makefile.am b/Makefile.am
> > index a3590c0..76ab546 100644
> > --- a/Makefile.am
> > +++ b/Makefile.am
> > @@ -20,7 +20,7 @@ weston.ini : $(srcdir)/weston.ini.in
> > $< > $@
> >
> > ivi-shell/weston.ini : $(srcdir)/ivi-shell/weston.ini.in
> > - $(AM_V_GEN)$(SED) \
> > + $(AM_V_GEN)$(MKDIR_P) $(dir $@) && $(SED) \
> > -e 's|@bindir[@]|$(bindir)|g' \
> > -e 's|@abs_top_builddir[@]|$(abs_top_builddir)|g' \
> > -e 's|@abs_top_srcdir[@]|$(abs_top_srcdir)|g' \
> > @@ -29,7 +29,7 @@ ivi-shell/weston.ini : $(srcdir)/ivi-shell/weston.ini.in
> > $< > $@
> >
> > tests/weston-ivi.ini : $(srcdir)/ivi-shell/weston.ini.in
> > - $(AM_V_GEN)$(SED) \
> > + $(AM_V_GEN)$(MKDIR_P) $(dir $@) && $(SED) \
> > -e 's|@bindir[@]|$(bindir)|g' \
> > -e 's|@abs_top_builddir[@]|$(abs_top_builddir)|g' \
> > -e 's|@abs_top_srcdir[@]|$(abs_top_srcdir)|g' \
> >
>
> You could have put my Rb directly. :-)
>
> Reviewed-by: Quentin Glidic <sardemff7+git at sardemff7.net>
Thanks, pushed:
To ssh://git.freedesktop.org/git/wayland/weston
7e07db9..2eff22b master -> master
More information about the wayland-devel
mailing list