Merge PR #516: Add rpath to nymead binary

debian/rules

@@ -16,11 +16,11 @@ ifeq (,$(filter nodoc,$(DEB_BUILD_OPTIONS)))
 	MAKE_TARGETS += doc
 endif 
 
-QMAKE_ADDITIONAL_ARGS=
+QMAKE_ADDITIONAL_ARGS = CONFIG+=norpath
 ifneq (,$(filter coverage,$(DEB_BUILD_OPTIONS)))
-	QMAKE_ADDITIONAL_ARGS += CONFIG+=coverage CONFIG+=debug
+        QMAKE_ADDITIONAL_ARGS += CONFIG+=coverage CONFIG+=debug
 else
-	QMAKE_ADDITIONAL_ARGS += CONFIG+=release
+        QMAKE_ADDITIONAL_ARGS += CONFIG+=release
 endif
 
 DPKG_EXPORT_BUILDFLAGS = 1

server/server.pro

@@ -17,6 +17,12 @@ LIBS += -L$$top_builddir/libnymea/ -lnymea \
         -L$$top_builddir/libnymea-core -lnymea-core \
         -lnymea-remoteproxyclient
 
+# Add rpath for easy running from the build dir, unless explicitly disabled
+!norpath: {
+    message("Adding rpath to nymead binary")
+    LIBS += -Wl,-rpath ../libnymea/:../libnymea-core/
+}
+
 CONFIG += link_pkgconfig
 PKGCONFIG += nymea-zigbee