use hardcoded path for systemd is optional

 - Allow compatibility with yocto build

Change-Id: I3532b17a93e65aa71b073f1875cd66937c5a50eb
Signed-off-by: Ronan Le Martret <ronan@fridu.net>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 87e4775..ada0f6a 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -69,8 +69,9 @@ ADD_DEFINITIONS("-std=c++11")
 
 SET(DESTINATION_PREFIX bin)
 SET(DBUS_SERVICE_PREFIX share/dbus-1/services)
-SET(SYSTEMD_SERVICE_PREFIX lib/systemd/user)
-
+IF(NOT SYSTEMD_SERVICE_PREFIX)
+     SET(SYSTEMD_SERVICE_PREFIX lib/systemd/user)
+ENDIF(NOT SYSTEMD_SERVICE_PREFIX)
 # -----------------------------------------------------------------------------
 # Macros for pkgconfig
 # -----------------------------------------------------------------------------

diff --git a/packaging/phoned.spec b/packaging/phoned.spec
index 281b551..94f6bf4 100644 (file)
--- a/packaging/phoned.spec
+++ b/packaging/phoned.spec
@@ -1,7 +1,9 @@
+%define PREFIX "%{_libdir}/wrt-plugins"
+
 Name:       phoned
 Summary:    OFono/Obex business logic for phone web APIs
 Version:    0.0.0
-Release:    1
+Release:    0
 Group:      Automotive/Modello
 License:    Apache-2.0
 Source0:    %{name}-%{version}.tar.gz
@@ -23,14 +25,14 @@ A service to export OFono/Obex functionality over DBUS, to be used by WebRuntime
 cp %{SOURCE1001} .
 
 %build
+export LDFLAGS="${LDFLAGS} -Wl,--rpath=%{PREFIX} -Wl,--as-needed"
 
-%define PREFIX "%{_libdir}/wrt-plugins"
-
-export LDFLAGS+="-Wl,--rpath=%{PREFIX} -Wl,--as-needed"
-
-%cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DENABLE_TIME_TRACER="OFF"
+%cmake . \
+       -DCMAKE_INSTALL_PREFIX=%{_prefix} \
+       -DENABLE_TIME_TRACER="OFF" \
+       -DSYSTEMD_SERVICE_PREFIX="%{_unitdir_user}"
 
-make %{?jobs:-j%jobs} VERBOSE=1
+%__make %{?_smp_mflags} VERBOSE=1
 
 %install
 rm -rf %{buildroot}
@@ -45,4 +47,3 @@ rm -rf %{buildroot}
 %{_prefix}/share/dbus-1/services/org.tizen.phone.service
 %{_unitdir_user}/phoned.service
 %{_unitdir_user}/weston.target.wants/phoned.service
-