Remove hardcoded lib path in spec and CMakelists

diff --git a/packaging/wrt-installer.spec b/packaging/wrt-installer.spec
index 0957f7f..935c607 100644 (file)
--- a/packaging/wrt-installer.spec
+++ b/packaging/wrt-installer.spec
@@ -67,7 +67,7 @@ cp %{SOURCE1001} .
 
 %build
 
-export LDFLAGS+="-Wl,--rpath=/usr/lib -Wl,--hash-style=both -Wl,--as-needed"
+export LDFLAGS+="-Wl,--rpath=%{_libdir} -Wl,--hash-style=both -Wl,--as-needed"
 LDFLAGS="$LDFLAGS"
 
 %cmake . -DCMAKE_INSTALL_PREFIX=/usr \
@@ -93,14 +93,14 @@ mkdir -p %{buildroot}/usr/share/license
 cp LICENSE %{buildroot}/usr/share/license/%{name}
 %make_install
 
-mkdir -p %{buildroot}%{_libdir}/systemd/system
-install -m 644 %{SOURCE100} %{buildroot}%{_libdir}/systemd/system
+mkdir -p %{buildroot}%{_unitdir}
+install -m 644 %{SOURCE100} %{buildroot}%{_unitdir}
 
 mkdir -p %{buildroot}/usr/bin
 install -m 755 wrt_preinstall_widgets.sh %{buildroot}/usr/bin
 
-mkdir -p %{buildroot}%{_libdir}/systemd/system/graphical.target.wants
-ln -s ../wrt-preinstall-widgets.service %{buildroot}%{_libdir}/systemd/system/graphical.target.wants
+mkdir -p %{buildroot}%{_unitdir}/graphical.target.wants
+ln -s ../wrt-preinstall-widgets.service %{buildroot}%{_unitdir}/graphical.target.wants
 
 mkdir -p %{buildroot}/opt/share/packages
 mkdir -p %{buildroot}/opt/usr/apps/.preinstallWidgets
@@ -128,8 +128,8 @@ mkdir -p /opt/share/icons/default/small
 %attr(755,root,root) %{_bindir}/wrt-installer
 /usr/etc/package-manager/backendlib/libwgt.so
 %{_datadir}/license/%{name}
-%{_libdir}/systemd/system/graphical.target.wants/wrt-preinstall-widgets.service
-%{_libdir}/systemd/system/wrt-preinstall-widgets.service
+%{_unitdir}/graphical.target.wants/wrt-preinstall-widgets.service
+%{_unitdir}/wrt-preinstall-widgets.service
 /usr/bin/wrt_preinstall_widgets.sh
 %dir /opt/share/packages
 %dir /opt/usr/apps/.preinstallWidgets

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index d1efa08..923ba92 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -199,7 +199,7 @@ TARGET_LINK_LIBRARIES(${TARGET_INSTALLER_STATIC}
 
 #for encryption
 IF(DECRYPT_SUPPORT)
-TARGET_LINK_LIBRARIES(${TARGET_INSTALLER_STATIC} -L/usr/lib/osp -losp-appfw )
+TARGET_LINK_LIBRARIES(${TARGET_INSTALLER_STATIC} -L${LIB_INSTALL_DIR}/osp -losp-appfw )
 ENDIF(DECRYPT_SUPPORT)
 
 ADD_SUBDIRECTORY(pkg-manager)