From 279b67bf8d0478256dc2c87989f6a83522d88f02 Mon Sep 17 00:00:00 2001
From: "Roger A. Light" <roger@atchoo.org>
Date: Wed, 18 Feb 2015 01:34:43 +0000
Subject: [PATCH] Minor packaging related fixes.

---
 ChangeLog.txt | 2 ++
 config.mk     | 2 +-
 src/Makefile  | 4 ++--
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 17849ce1..d765b0c1 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -2,6 +2,7 @@
 ==============
 
 Important changes:
+- Websockets support in the broker.
 - Bridge behaviour on the local broker has changed due to the introduction of
   the local_* options. This may affect you if you are using authentication
   and/or ACLs with bridges.
@@ -23,6 +24,7 @@ Important changes:
 
 
 Broker:
+- Websockets support in the broker.
 - Add local_clientid, local_username, local_password for bridge connections to
   authenticate to the local broker.
 - Default TLS mode now accepts TLS v1.2, v1.1 and v1.0.
diff --git a/config.mk b/config.mk
index 77d679f8..c0f175f1 100644
--- a/config.mk
+++ b/config.mk
@@ -81,7 +81,7 @@ WITH_SOCKS:=yes
 # =============================================================================
 
 
-# Also bump lib/mosquitto.h, lib/python/setup.py, CMakeLists.txt,
+# Also bump lib/mosquitto.h, CMakeLists.txt,
 # installer/mosquitto.nsi, installer/mosquitto-cygwin.nsi
 VERSION=1.4
 TIMESTAMP:=$(shell date "+%F %T%z")
diff --git a/src/Makefile b/src/Makefile
index e7ef1f07..2cfb7d40 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -103,10 +103,10 @@ mosquitto_passwd.o : mosquitto_passwd.c
 
 install : all
 	$(INSTALL) -d ${DESTDIR}$(prefix)/sbin
-	$(INSTALL) -s --strip-program=$(STRIP) mosquitto ${DESTDIR}${prefix}/sbin/mosquitto
+	$(INSTALL) -s --strip-program=${CROSS_COMPILE}${STRIP} mosquitto ${DESTDIR}${prefix}/sbin/mosquitto
 	$(INSTALL) mosquitto_plugin.h ${DESTDIR}${prefix}/include/mosquitto_plugin.h
 ifeq ($(WITH_TLS),yes)
-	$(INSTALL) -s --strip-program=$(STRIP) mosquitto_passwd ${DESTDIR}${prefix}/bin/mosquitto_passwd
+	$(INSTALL) -s --strip-program=${CROSS_COMPILE}${STRIP} mosquitto_passwd ${DESTDIR}${prefix}/bin/mosquitto_passwd
 endif
 
 uninstall :