From 1cd40925b86ca5de1d4f2c694a1cdf0dc4619350 Mon Sep 17 00:00:00 2001 From: "Roger A. Light" Date: Mon, 6 Jun 2016 16:11:42 +0100 Subject: [PATCH] [184] Don't attempt to install docs when WITH_DOCS=no. Thanks to minghuadev. Bug: https://github.com/eclipse/mosquitto/issues/184 --- ChangeLog.txt | 3 +++ Makefile | 2 ++ src/Makefile | 2 ++ 3 files changed, 7 insertions(+) diff --git a/ChangeLog.txt b/ChangeLog.txt index 1c73526c..6ddcdcee 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -5,6 +5,9 @@ Broker: - Fix TLS operation with websockets listeners and libwebsockts 2.x. Closes #186. +Build: +- Don't attempt to install docs when WITH_DOCS=no. Closes #184. + 1.4.9 - 20160603 ================ diff --git a/Makefile b/Makefile index 967ba266..1fc0805d 100644 --- a/Makefile +++ b/Makefile @@ -36,7 +36,9 @@ test : mosquitto install : mosquitto set -e; for d in ${DIRS}; do $(MAKE) -C $${d} install; done +ifeq ($(WITH_DOCS),yes) set -e; for d in ${DOCDIRS}; do $(MAKE) -C $${d} install; done +endif $(INSTALL) -d ${DESTDIR}/etc/mosquitto $(INSTALL) -m 644 mosquitto.conf ${DESTDIR}/etc/mosquitto/mosquitto.conf.example $(INSTALL) -m 644 aclfile.example ${DESTDIR}/etc/mosquitto/aclfile.example diff --git a/src/Makefile b/src/Makefile index 2bc70dec..52dc02c5 100644 --- a/src/Makefile +++ b/src/Makefile @@ -104,8 +104,10 @@ mosquitto_passwd.o : mosquitto_passwd.c install : all $(INSTALL) -d ${DESTDIR}$(prefix)/sbin $(INSTALL) -s --strip-program=${CROSS_COMPILE}${STRIP} mosquitto ${DESTDIR}${prefix}/sbin/mosquitto + $(INSTALL) -d ${DESTDIR}$(prefix)/include $(INSTALL) mosquitto_plugin.h ${DESTDIR}${prefix}/include/mosquitto_plugin.h ifeq ($(WITH_TLS),yes) + $(INSTALL) -d ${DESTDIR}$(prefix)/bin $(INSTALL) -s --strip-program=${CROSS_COMPILE}${STRIP} mosquitto_passwd ${DESTDIR}${prefix}/bin/mosquitto_passwd endif