[Packaging] Fix systemd socket packaging.

xrootd · Apr 10, 2017 · c755af9 · c755af9
1 parent f31bff6
commit c755af9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/packaging/rhel/xrootd.spec.in b/packaging/rhel/xrootd.spec.in
@@ -448,7 +448,7 @@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/xrootd
 
 mkdir -p $RPM_BUILD_ROOT%{_unitdir}
 install -m 644 packaging/common/xrootd@.service $RPM_BUILD_ROOT%{_unitdir}
-install -m 644 packaging/common/xrootd.socket   $RPM_BUILD_ROOT%{_unitdir}
+install -m 644 packaging/common/xrdhttp.socket   $RPM_BUILD_ROOT%{_unitdir}
 install -m 644 packaging/common/cmsd@.service $RPM_BUILD_ROOT%{_unitdir}
 install -m 644 packaging/common/frm_xfrd@.service $RPM_BUILD_ROOT%{_unitdir}
 install -m 644 packaging/common/frm_purged@.service $RPM_BUILD_ROOT%{_unitdir}

diff --git a/src/XrdUtils.cmake b/src/XrdUtils.cmake
@@ -196,11 +196,17 @@ target_link_libraries(
   XrdUtils
   pthread
   dl
-  ${SYSTEMD_LIBRARY}
   ${SOCKET_LIBRARY}
   ${SENDFILE_LIBRARY}
   ${EXTRA_LIBS} )
 
+if ( SYSTEMD_FOUND )
+   target_link_libraries(
+     XrdUtils
+     ${SYSTEMD_LIBRARIES}
+   )
+endif()
+
 set_target_properties(
   XrdUtils
   PROPERTIES