From ee4743adf5019ccc800257991492aec75d2f3e44 Mon Sep 17 00:00:00 2001 From: Chris Luke Date: Thu, 1 Sep 2016 09:04:01 -0400 Subject: VPP-221 Improve doxygen dependency check 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 --- doxygen/Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'doxygen') diff --git a/doxygen/Makefile b/doxygen/Makefile index df7d07d72ea..f3ddb2c991c 100644 --- a/doxygen/Makefile +++ b/doxygen/Makefile @@ -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 -- cgit 1.2.3-korg