Fix use of sed on BSD.

Closes #1614. Thanks to Christoph Krey.
eclipse · Mar 12, 2020 · 7f41e37 · 7f41e37 · ckrey · Mar 12, 2020
1 parent c84d175
commit 7f41e37
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 2 deletions.
diff --git a/ChangeLog.txt b/ChangeLog.txt
@@ -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

diff --git a/config.mk b/config.mk
@@ -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)

diff --git a/lib/Makefile b/lib/Makefile
@@ -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

diff --git a/lib/cpp/Makefile b/lib/cpp/Makefile
@@ -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}"