VPP-221 Improve doxygen dependency check 85/2585/2
authorChris Luke <chrisy@flirble.org>
Thu, 1 Sep 2016 13:04:01 +0000 (09:04 -0400)
committerDave Wallace <dwallacelf@gmail.com>
Fri, 2 Sep 2016 05:33:01 +0000 (05:33 +0000)
Only try to install packages if they're not installed.
Saves a trip through sudo which is useful when you have a
non-privileged account generating the docs.

Change-Id: I3709aceb15516a45ea2f9510d91c6d2e42c8c349
Signed-off-by: Chris Luke <chrisy@flirble.org>
doxygen/Makefile

index df7d07d..f3ddb2c 100644 (file)
@@ -63,7 +63,11 @@ SIPHON_DOCS = $(addprefix $(SIPHON_OUTPUT)/,$(addsuffix .md,$(SIPHONS)))
 
 $(BR)/.doxygen-bootstrap.ok:
 ifeq ($(OS_ID),ubuntu)
-       @sudo -E apt-get $(CONFIRM) $(FORCE) install $(DOC_DEB_DEPENDS)
+       @set -e; inst=; \
+               for i in $(DOC_DEB_DEPENDS); do \
+                       dpkg-query --show $$i >/dev/null 2>&1 || inst="$$inst $$i"; \
+               done; \
+               [ "$$inst" ] && sudo apt-get $(CONFIRM) $(FORCE) install $$inst
 else ifneq ("$(wildcard /etc/redhat-release)","")
        @sudo yum install $(CONFIRM) $(DOC_RPM_DEPENDS)
 else