mirror of
https://github.com/eclipse/mosquitto.git
synced 2025-05-09 01:01:11 +08:00
Fix install
target when using WITH_CJSON=no.
Closes #1938. Thanks to apple3306 and JulianCaruso.
This commit is contained in:
parent
cc47eaba09
commit
f7dc138157
@ -1,3 +1,7 @@
|
||||
Build:
|
||||
- Fix `install` target when using WITH_CJSON=no. Closes #1938.
|
||||
|
||||
|
||||
2.0.2 - 2020-12-10
|
||||
==================
|
||||
|
||||
|
@ -36,7 +36,7 @@ else
|
||||
TARGET:=
|
||||
endif
|
||||
|
||||
all : $(TARGET)
|
||||
all : ${TARGET}
|
||||
|
||||
mosquitto_ctrl : ${OBJS}
|
||||
${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 $@
|
||||
|
||||
install : all
|
||||
ifeq ($(WITH_TLS),yes)
|
||||
ifeq ($(WITH_CJSON),yes)
|
||||
$(INSTALL) -d "${DESTDIR}$(prefix)/bin"
|
||||
$(INSTALL) ${STRIP_OPTS} mosquitto_ctrl "${DESTDIR}${prefix}/bin/mosquitto_ctrl"
|
||||
endif
|
||||
endif
|
||||
|
||||
uninstall :
|
||||
-rm -f "${DESTDIR}${prefix}/bin/mosquitto_ctrl"
|
||||
|
@ -74,9 +74,13 @@ clean:
|
||||
check: test
|
||||
test:
|
||||
|
||||
install: ${PLUGIN_NAME}.so
|
||||
install: all
|
||||
ifeq ($(WITH_CJSON),yes)
|
||||
ifeq ($(WITH_TLS),yes)
|
||||
$(INSTALL) -d "${DESTDIR}$(prefix)/lib"
|
||||
$(INSTALL) ${STRIP_OPTS} ${PLUGIN_NAME}.so "${DESTDIR}${prefix}/lib/${PLUGIN_NAME}.so"
|
||||
endif
|
||||
endif
|
||||
|
||||
uninstall :
|
||||
-rm -f "${DESTDIR}${prefix}/lib/${PLUGIN_NAME}.so"
|
||||
|
Loading…
x
Reference in New Issue
Block a user