projects
/
platform
/
core
/
connectivity
/
zigbee-manager.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix build issue on 64bit environment
[platform/core/connectivity/zigbee-manager.git]
/
packaging
/
zigbee-manager.spec
diff --git
a/packaging/zigbee-manager.spec
b/packaging/zigbee-manager.spec
index
19fb9fc
..
79e1b2a
100644
(file)
--- a/
packaging/zigbee-manager.spec
+++ b/
packaging/zigbee-manager.spec
@@
-50,7
+50,10
@@
cp -a %{SOURCE2} .
%endif
%build
%endif
%build
-cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DVERSION=%{version} \
+cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} \
+ -DVERSION=%{version} \
+ -DLIB_INSTALL_DIR=%{_libdir} \
+ -DUNIT_INSTALL_DIR=%{_unitdir} \
make %{?_smp_mflags}
make %{?_smp_mflags}
@@
-58,8
+61,8
@@
make %{?_smp_mflags}
%make_install
# Do not execute daemon on boot time
%make_install
# Do not execute daemon on boot time
-#mkdir -p %{buildroot}%{_
libdir}/systemd/system
/multi-user.target.wants
-#ln -s %{_
libdir}/systemd/system/zigbee-daemon.service %{buildroot}%{_libdir}/systemd/system
/multi-user.target.wants/zigbee-daemon.service
+#mkdir -p %{buildroot}%{_
unitdir}
/multi-user.target.wants
+#ln -s %{_
unitdir}/zigbee-daemon.service %{buildroot}%{_unitdir}
/multi-user.target.wants/zigbee-daemon.service
mkdir -p %{buildroot}%{_datadir}/dbus-1/system-services/
mkdir -p %{buildroot}%{_datadir}/dbus-1/system.d/
mkdir -p %{buildroot}%{_datadir}/dbus-1/system-services/
mkdir -p %{buildroot}%{_datadir}/dbus-1/system.d/
@@
-76,8
+79,8
@@
cp %{SOURCE2} %{buildroot}%{_datadir}/dbus-1/system.d/zigbee.conf
%manifest zigbee-daemon.manifest
%defattr(644,system,system,-)
%attr(755,system,system) %{_bindir}/zigbee-daemon
%manifest zigbee-daemon.manifest
%defattr(644,system,system,-)
%attr(755,system,system) %{_bindir}/zigbee-daemon
-%{_
libdir}/systemd/system
/zigbee-daemon.service
-#%{_
libdir}/systemd/system
/multi-user.target.wants/zigbee-daemon.service
+%{_
unitdir}
/zigbee-daemon.service
+#%{_
unitdir}
/multi-user.target.wants/zigbee-daemon.service
%{_datadir}/license/zigbee-daemon
%attr(644,root,root) %{_datadir}/dbus-1/system-services/*
%if %{CHECK_ZIGBEE_PRIVILEGE} == "True"
%{_datadir}/license/zigbee-daemon
%attr(644,root,root) %{_datadir}/dbus-1/system-services/*
%if %{CHECK_ZIGBEE_PRIVILEGE} == "True"