Permalink
Browse files

[184] Don't attempt to install docs when WITH_DOCS=no.

Thanks to minghuadev.

Bug: #184
  • Loading branch information...
1 parent 63416e6 commit 1cd40925b86ca5de1d4f2c694a1cdf0dc4619350 @ralight ralight committed Jun 6, 2016
Showing with 7 additions and 0 deletions.
  1. +3 −0 ChangeLog.txt
  2. +2 −0 Makefile
  3. +2 −0 src/Makefile
View
@@ -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
================
View
@@ -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
View
@@ -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

0 comments on commit 1cd4092

Please sign in to comment.