d0kuhn/mosquitto
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix install target when using WITH_CJSON=no.

Browse Source 
Closes #1938. Thanks to apple3306 and JulianCaruso.
This commit is contained in:
Roger A. Light 2020-12-11 00:02:43 +00:00
parent cc47eaba09
commit f7dc138157
3 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog.txt
View File

@ -1,3 +1,7 @@
Build:
- Fix `install` target when using WITH_CJSON=no. Closes #1938.
2.0.2 - 2020-12-10 2.0.2 - 2020-12-10
================== ==================

6
apps/mosquitto_ctrl/Makefile
View File

@ -36,7 +36,7 @@ else
TARGET:= TARGET:=
endif endif
all : $(TARGET) all : ${TARGET}
mosquitto_ctrl : ${OBJS} mosquitto_ctrl : ${OBJS}
${CROSS_COMPILE}${CC} ${APP_LDFLAGS} $^ -o $@ $(PASSWD_LDADD) $(LOCAL_LDFLAGS) $(LIBMOSQ) -lcjson -ldl ${CROSS_COMPILE}${CC} ${APP_LDFLAGS} $^ -o $@ $(PASSWD_LDADD) $(LOCAL_LDFLAGS) $(LIBMOSQ) -lcjson -ldl
@ -84,8 +84,12 @@ password_mosq.o : ../../src/password_mosq.c ../../src/password_mosq.h
${CROSS_COMPILE}${CC} $(APP_CPPFLAGS) $(APP_CFLAGS) -c $< -o $@ ${CROSS_COMPILE}${CC} $(APP_CPPFLAGS) $(APP_CFLAGS) -c $< -o $@
install : all install : all
ifeq ($(WITH_TLS),yes)
ifeq ($(WITH_CJSON),yes)
$(INSTALL) -d "${DESTDIR}$(prefix)/bin" $(INSTALL) -d "${DESTDIR}$(prefix)/bin"
$(INSTALL) ${STRIP_OPTS} mosquitto_ctrl "${DESTDIR}${prefix}/bin/mosquitto_ctrl" $(INSTALL) ${STRIP_OPTS} mosquitto_ctrl "${DESTDIR}${prefix}/bin/mosquitto_ctrl"
endif
endif
uninstall : uninstall :
-rm -f "${DESTDIR}${prefix}/bin/mosquitto_ctrl" -rm -f "${DESTDIR}${prefix}/bin/mosquitto_ctrl"

6
plugins/dynamic-security/Makefile
View File

@ -74,9 +74,13 @@ clean:
check: test check: test
test: test:
install: ${PLUGIN_NAME}.so install: all
ifeq ($(WITH_CJSON),yes)
ifeq ($(WITH_TLS),yes)
$(INSTALL) -d "${DESTDIR}$(prefix)/lib" $(INSTALL) -d "${DESTDIR}$(prefix)/lib"
$(INSTALL) ${STRIP_OPTS} ${PLUGIN_NAME}.so "${DESTDIR}${prefix}/lib/${PLUGIN_NAME}.so" $(INSTALL) ${STRIP_OPTS} ${PLUGIN_NAME}.so "${DESTDIR}${prefix}/lib/${PLUGIN_NAME}.so"
endif
endif
uninstall : uninstall :
-rm -f "${DESTDIR}${prefix}/lib/${PLUGIN_NAME}.so" -rm -f "${DESTDIR}${prefix}/lib/${PLUGIN_NAME}.so"