ovs-bugtool: Bugfix for bugtool plugin queries.

[ovs.git] / utilities / bugtool / automake.mk

diff --git a/utilities/bugtool/automake.mk b/utilities/bugtool/automake.mk
index 36d80cec43f11ae8fd464c39de739815ef65e9a4..5097f2bf9305d0338da7b66da746ad30a3e2e0ef 100644 (file)
--- a/utilities/bugtool/automake.mk
+++ b/utilities/bugtool/automake.mk
@@ -4,7 +4,7 @@ CLEANFILES += utilities/bugtool/ovs-bugtool
 
 man_MANS += utilities/bugtool/ovs-bugtool.8
 MAN_ROOTS += utilities/bugtool/ovs-bugtool.8.in
-DISTCLEANFILES += utilities/bugtool/ovs-bugtool.8
+CLEANFILES += utilities/bugtool/ovs-bugtool.8
 
 bugtool_plugins = \
        utilities/bugtool/plugins/kernel-info/openvswitch.xml \
@@ -25,17 +25,21 @@ bugtool_scripts = \
        utilities/bugtool/ovs-bugtool-vsctl-show \
        utilities/bugtool/ovs-bugtool-ovsdb-dump \
        utilities/bugtool/ovs-bugtool-daemons-ver \
-       utilities/bugtool/ovs-bugtool-ovs-ofctl-show \
-       utilities/bugtool/ovs-bugtool-ovs-ofctl-dump-flows \
+       utilities/bugtool/ovs-bugtool-ovs-ofctl-loop-over-bridges \
        utilities/bugtool/ovs-bugtool-ovs-appctl-dpif \
-       utilities/bugtool/ovs-bugtool-bond-show
+       utilities/bugtool/ovs-bugtool-bond-show \
+       utilities/bugtool/ovs-bugtool-conntrack-dump
+
 scripts_SCRIPTS += $(bugtool_scripts)
 
+FLAKE8_PYFILES += utilities/bugtool/ovs-bugtool.in
+
 bugtoolpluginsdir = $(pkgdatadir)/bugtool-plugins
 INSTALL_DATA_LOCAL += bugtool-install-data-local
 bugtool-install-data-local:
        for plugin in $(bugtool_plugins); do \
-         stem=`echo "$$plugin" | sed 's,utilities/bugtool/plugins/,,'`; \
+         stem=`echo "$$plugin" | sed 's,ovn/,,'`; \
+         stem=`echo "$$stem" | sed 's,utilities/bugtool/plugins/,,'`; \
          dir=`expr "$$stem" : '\(.*\)/[^/]*$$'`; \
          $(MKDIR_P) "$(DESTDIR)$(bugtoolpluginsdir)/$$dir"; \
          $(INSTALL_DATA) "$(srcdir)/$$plugin" "$(DESTDIR)$(bugtoolpluginsdir)/$$stem"; \
@@ -44,13 +48,17 @@ bugtool-install-data-local:
 UNINSTALL_LOCAL += bugtool-uninstall-local
 bugtool-uninstall-local:
        for plugin in $(bugtool_plugins); do \
-         stem=`echo "$$plugin" | sed 's,utilities/bugtool/plugins/,,'`; \
+         stem=`echo "$$plugin" | sed 's,ovn/,,'`; \
+         stem=`echo "$$stem" | sed 's,utilities/bugtool/plugins/,,'`; \
          rm -f "$(DESTDIR)$(bugtoolpluginsdir)/$$stem"; \
        done
        for plugin in $(bugtool_plugins); do \
-         stem=`echo "$$plugin" | sed 's,utilities/bugtool/plugins/,,'`; \
+         stem=`echo "$$plugin" | sed 's,ovn/,,'`; \
+         stem=`echo "$$stem" | sed 's,utilities/bugtool/plugins/,,'`; \
          dir=`expr "$$stem" : '\(.*\)/[^/]*$$'`; \
-         rmdir "$(DESTDIR)$(bugtoolpluginsdir)/$$dir"; \
+         if [ ! -z "$$dir" ]; then \
+           rm -rf "$(DESTDIR)$(bugtoolpluginsdir)/$$dir"; \
+         fi \
        done; exit 0
 endif