From d6634e833e34eb649e1a8ca070b42ab9f45e5137 Mon Sep 17 00:00:00 2001
From: Justin Hammond <justin@dynam.ac>
Date: Sun, 29 Dec 2019 14:46:35 +0800
Subject: [PATCH] Fix up install paths - Remove backtrace function

---
 qt-openzwavedatabase/qt-openzwavedatabase.pro |  5 +++++
 qt-ozwdaemon/main.cpp                         | 14 --------------
 qt-ozwdaemon/qt-ozwdaemon.pro                 |  9 ++++-----
 3 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/qt-openzwavedatabase/qt-openzwavedatabase.pro b/qt-openzwavedatabase/qt-openzwavedatabase.pro
index 719bdc2..481cd10 100644
--- a/qt-openzwavedatabase/qt-openzwavedatabase.pro
+++ b/qt-openzwavedatabase/qt-openzwavedatabase.pro
@@ -27,4 +27,9 @@ ozwconfig.commands=cp -R ../../open-zwave/config config/ && cd config && $$[QT_I
 
     INCLUDEPATH += include/
     QMAKE_CXXFLAGS += -g1
+    target.path = /usr/local/lib/
+    INSTALLS += target
+    QMAKE_CXXFLAGS += -g1
+    QMAKE_LFLAGS += -rdynamic
 }
+
diff --git a/qt-ozwdaemon/main.cpp b/qt-ozwdaemon/main.cpp
index 903c6f9..9a501d4 100644
--- a/qt-ozwdaemon/main.cpp
+++ b/qt-ozwdaemon/main.cpp
@@ -1,4 +1,3 @@
-#include <execinfo.h>
 #include <signal.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -12,22 +11,9 @@
 #include "mqttpublisher.h"
 #endif
 
-void handler(int sig) {
-  void *array[10];
-  size_t size;
-
-  // get void*'s for all entries on the stack
-  size = backtrace(array, 10);
-
-  // print out all the frames to stderr
-  fprintf(stderr, "Error: signal %d:\n", sig);
-  backtrace_symbols_fd(array, size, STDERR_FILENO);
-  exit(1);
-}
 
 int main(int argc, char *argv[])
 {
-    //signal(SIGSEGV, handler);   // install our handler
 
 
     QCoreApplication a(argc, argv);
diff --git a/qt-ozwdaemon/qt-ozwdaemon.pro b/qt-ozwdaemon/qt-ozwdaemon.pro
index 82d855f..6f703b9 100644
--- a/qt-ozwdaemon/qt-ozwdaemon.pro
+++ b/qt-ozwdaemon/qt-ozwdaemon.pro
@@ -117,11 +117,6 @@ SOURCES += main.cpp \
         qtozwdaemon.cpp
 
 
-# Default rules for deployment.
-qnx: target.path = /tmp/$${TARGET}/bin
-else: unix:!android: target.path = /opt/$${TARGET}/bin
-!isEmpty(target.path): INSTALLS += target
-
 HEADERS += \
     qtozwdaemon.h \
 
@@ -132,6 +127,10 @@ include(../qt-openzwave.pri)
 INCLUDEPATH += ../qt-openzwave/include/
 
 unix {
+	# Default rules for deployment.
+	target.path = /usr/local/bin
+	INSTALLS += target
+
     LIBS += -lresolv -L../qt-openzwave/ -lqt-openzwave -L../qt-openzwavedatabase/ -lqt-openzwavedatabase
     INCLUDEPATH += ../qt-openzwavedatabase/include/
     QMAKE_CXXFLAGS += -g1