vswitchd: Use vswitch-specific variable name in automake.mk.

The variable OVSDB_DOT_DIAGRAM_ARG is describing the vswitch dot file,
so use the name VSWITCH_DOT_DIAGRAM_ARG to prevent confusion in the
generated makefile.

Signed-off-by: Justin Pettit <jpettit@nicira.com>
Acked-by: Ben Pfaff <blp@nicira.com>

diff --git a/vswitchd/automake.mk b/vswitchd/automake.mk
index f80f754..02d413e 100644 (file)
--- a/vswitchd/automake.mk
+++ b/vswitchd/automake.mk
@@ -34,7 +34,7 @@ vswitchd/vswitch.gv: ovsdb/ovsdb-dot.in vswitchd/vswitch.ovsschema
 vswitchd/vswitch.pic: vswitchd/vswitch.gv ovsdb/dot2pic
        (dot -T plain < vswitchd/vswitch.gv | $(srcdir)/ovsdb/dot2pic -f 3) > $@;
 VSWITCH_PIC = vswitchd/vswitch.pic
-OVSDB_DOT_DIAGRAM_ARG = --er-diagram=$(VSWITCH_PIC)
+VSWITCH_DOT_DIAGRAM_ARG = --er-diagram=$(VSWITCH_PIC)
 DISTCLEANFILES += vswitchd/vswitch.gv vswitchd/vswitch.pic
 endif
 endif
@@ -48,7 +48,7 @@ vswitchd/ovs-vswitchd.conf.db.5: \
        $(VSWITCH_PIC)
        $(OVSDB_DOC) \
                --title="ovs-vswitchd.conf.db" \
-               $(OVSDB_DOT_DIAGRAM_ARG) \
+               $(VSWITCH_DOT_DIAGRAM_ARG) \
                --version=$(VERSION) \
                $(srcdir)/vswitchd/vswitch.ovsschema \
                $(srcdir)/vswitchd/vswitch.xml > $@.tmp