parent
c84d175b3d
commit
7f41e37f0f
@ -1,5 +1,6 @@
|
||||
Build:
|
||||
- Various fixes for building with <C99 support. Closes #1622.
|
||||
- Fix use of sed on BSD. Closes #1614.
|
||||
|
||||
|
||||
1.6.9 - 20200227
|
||||
|
@ -158,8 +158,10 @@ PASSWD_LDADD:=
|
||||
|
||||
ifneq ($(or $(findstring $(UNAME),FreeBSD), $(findstring $(UNAME),OpenBSD), $(findstring $(UNAME),NetBSD)),)
|
||||
BROKER_LDADD:=$(BROKER_LDADD) -lm
|
||||
SEDINPLACE:=-i ""
|
||||
else
|
||||
BROKER_LDADD:=$(BROKER_LDADD) -ldl -lm
|
||||
SEDINPLACE:=-i
|
||||
endif
|
||||
|
||||
ifeq ($(UNAME),Linux)
|
||||
|
@ -74,7 +74,7 @@ endif
|
||||
$(INSTALL) mqtt_protocol.h "${DESTDIR}${incdir}/mqtt_protocol.h"
|
||||
$(INSTALL) -d "${DESTDIR}${libdir}/pkgconfig"
|
||||
$(INSTALL) -m644 ../libmosquitto.pc.in "${DESTDIR}${libdir}/pkgconfig/libmosquitto.pc"
|
||||
sed -i -e "s#@CMAKE_INSTALL_PREFIX@#${prefix}#" -e "s#@VERSION@#${VERSION}#" "${DESTDIR}${libdir}/pkgconfig/libmosquitto.pc"
|
||||
sed ${SEDINPLACE} -e "s#@CMAKE_INSTALL_PREFIX@#${prefix}#" -e "s#@VERSION@#${VERSION}#" "${DESTDIR}${libdir}/pkgconfig/libmosquitto.pc"
|
||||
ifeq ($(WITH_SHARED_LIBRARIES),yes)
|
||||
$(MAKE) -C cpp install
|
||||
endif
|
||||
|
@ -26,7 +26,7 @@ endif
|
||||
$(INSTALL) mosquittopp.h "${DESTDIR}${incdir}/mosquittopp.h"
|
||||
$(INSTALL) -d "${DESTDIR}${libdir}/pkgconfig/"
|
||||
$(INSTALL) -m644 ../../libmosquittopp.pc.in "${DESTDIR}${libdir}/pkgconfig/libmosquittopp.pc"
|
||||
sed -i -e "s#@CMAKE_INSTALL_PREFIX@#${prefix}#" -e "s#@VERSION@#${VERSION}#" "${DESTDIR}${libdir}/pkgconfig/libmosquittopp.pc"
|
||||
sed ${SEDINPLACE} -e "s#@CMAKE_INSTALL_PREFIX@#${prefix}#" -e "s#@VERSION@#${VERSION}#" "${DESTDIR}${libdir}/pkgconfig/libmosquittopp.pc"
|
||||
|
||||
uninstall :
|
||||
-rm -f "${DESTDIR}${libdir}/libmosquittopp.so.${SOVERSION}"
|
||||
|
Loading…
Reference in New Issue
Block a user