Fix rpmbuild issues (#1881)

Signed-off-by: Michael Theall <[email protected]>

CMakeLists.txt

@@ -191,7 +191,7 @@ if(APPEND_PROJECT_NAME_TO_INCLUDEDIR)
 endif()
 set(INCLUDE_INSTALL_DIR "${_include_dir}" CACHE PATH "Installation directory for C++ headers")
 unset(_include_dir)
-set(LIB_INSTALL_DIR lib/ CACHE PATH "Installation directory for libraries")
+set(LIB_INSTALL_DIR lib${LIB_SUFFIX}/ CACHE PATH "Installation directory for libraries")
 set(DATA_INSTALL_DIR share/ CACHE PATH "Installation directory for data")
 if(WIN32)
     set(DOC_DIR "doc")

tools/fastdds/fastdds

@@ -1,2 +1,4 @@
+#!/bin/sh
+
 dir="`dirname \"$0\"`"
 python3 "$dir/../tools/fastdds/fastdds.py" ${@}

tools/fastdds/ros-discovery

@@ -1,2 +1,4 @@
+#!/bin/sh
+
 dir="`dirname \"$0\"`"
 python3 "$dir/../tools/fastdds/fastdds.py" discovery ${@}

tools/fds/CMakeLists.txt

@@ -127,6 +127,6 @@ if( WIN32 )
 else()
     # Use ln to create the symbolic link. We remove the version from the file name but keep the debug suffix
     install(
-        CODE "execute_process(COMMAND bash -c \"if [[ -h ${PROJECT_NAME} ]]; then rm ${PROJECT_NAME}; fi;  ln -s $<TARGET_FILE_NAME:${PROJECT_NAME}> ${PROJECT_NAME}\" WORKING_DIRECTORY \"${CMAKE_INSTALL_PREFIX}/${BIN_INSTALL_DIR}${MSVCARCH_DIR_EXTENSION}\")"
+        CODE "execute_process(COMMAND bash -c \"if [[ -h ${PROJECT_NAME} ]]; then rm ${PROJECT_NAME}; fi;  ln -s $<TARGET_FILE_NAME:${PROJECT_NAME}> ${PROJECT_NAME}\" WORKING_DIRECTORY \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${BIN_INSTALL_DIR}${MSVCARCH_DIR_EXTENSION}\")"
         COMPONENT discovery)
 endif()