[ovs-dev] [PATCH] Makefiles: Fix invocation of dot2pic when builddir != srcdir.
YAMAMOTO Takashi
yamamoto at valinux.co.jp
Fri May 9 04:26:03 UTC 2014
sorry, i didn't know builddir can be different from srcdir.
> CC: YAMAMOTO Takashi <yamamoto at valinux.co.jp>
> Signed-off-by: Ben Pfaff <blp at nicira.com>
> ---
> vswitchd/automake.mk | 2 +-
> vtep/automake.mk | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/vswitchd/automake.mk b/vswitchd/automake.mk
> index fd291ef..a09605f 100644
> --- a/vswitchd/automake.mk
> +++ b/vswitchd/automake.mk
> @@ -31,7 +31,7 @@ if HAVE_DOT
> vswitchd/vswitch.gv: ovsdb/ovsdb-dot.in vswitchd/vswitch.ovsschema
> $(OVSDB_DOT) --no-arrows $(srcdir)/vswitchd/vswitch.ovsschema > $@
> vswitchd/vswitch.pic: vswitchd/vswitch.gv ovsdb/dot2pic
> - (dot -T plain < vswitchd/vswitch.gv | $(PERL) ovsdb/dot2pic -f 3) > $@.tmp;
> + (dot -T plain < vswitchd/vswitch.gv | $(PERL) $(srcdir)/ovsdb/dot2pic -f 3) > $@.tmp;
> mv $@.tmp $@
> VSWITCH_PIC = vswitchd/vswitch.pic
> VSWITCH_DOT_DIAGRAM_ARG = --er-diagram=$(VSWITCH_PIC)
> diff --git a/vtep/automake.mk b/vtep/automake.mk
> index 02a34b2..4f48aeb 100644
> --- a/vtep/automake.mk
> +++ b/vtep/automake.mk
> @@ -34,7 +34,7 @@ if HAVE_DOT
> vtep/vtep.gv: ovsdb/ovsdb-dot.in vtep/vtep.ovsschema
> $(OVSDB_DOT) --no-arrows $(srcdir)/vtep/vtep.ovsschema > $@
> vtep/vtep.pic: vtep/vtep.gv ovsdb/dot2pic
> - (dot -T plain < vtep/vtep.gv | $(PERL) ovsdb/dot2pic -f 3) > $@.tmp;
> + (dot -T plain < vtep/vtep.gv | $(PERL) $(srcdir) ovsdb/dot2pic -f 3) > $@.tmp;
missing / ?
YAMAMOTO Takashi
> mv $@.tmp $@
> VTEP_PIC = vtep/vtep.pic
> VTEP_DOT_DIAGRAM_ARG = --er-diagram=$(VTEP_PIC)
> --
> 1.9.1
>
> _______________________________________________
> dev mailing list
> dev at openvswitch.org
> http://openvswitch.org/mailman/listinfo/dev
More information about the dev
mailing list