diff -urN urdfdom_headers-1.0.1/cmake/pkgconfig/urdfdom_headers.pc.in urdfdom_headers-1.0.1.fedora/cmake/pkgconfig/urdfdom_headers.pc.in
--- urdfdom_headers-1.0.1/cmake/pkgconfig/urdfdom_headers.pc.in	2018-02-21 20:16:52.000000000 +0000
+++ urdfdom_headers-1.0.1.fedora/cmake/pkgconfig/urdfdom_headers.pc.in	2018-11-23 17:58:12.949987156 +0000
@@ -1,7 +1,7 @@
 # This file was generated by CMake for @PROJECT_NAME@
 prefix=@CMAKE_INSTALL_PREFIX@
 exec_prefix=${prefix}
-includedir=${prefix}/include
+includedir=${prefix}/@URDF_INCLUDE_DIR@
 
 Name: @PACKAGE_NAME@
 Description: @PACKAGE_DESC@
diff -urN urdfdom_headers-1.0.1/CMakeLists.txt urdfdom_headers-1.0.1.fedora/CMakeLists.txt
--- urdfdom_headers-1.0.1/CMakeLists.txt	2018-02-21 20:16:52.000000000 +0000
+++ urdfdom_headers-1.0.1.fedora/CMakeLists.txt	2018-11-23 17:58:12.949987156 +0000
@@ -8,8 +8,9 @@
 set (URDF_PATCH_VERSION 0)
 
 set (URDF_VERSION ${URDF_MAJOR_VERSION}.${URDF_MINOR_VERSION}.${URDF_PATCH_VERSION})
-
+set (URDF_INCLUDE_DIR "include" CACHE PATH "Installation directory for URDF headers")
 message (STATUS "${PROJECT_NAME} version ${URDF_VERSION}")
+set(CMAKE_SIZEOF_VOID_P "")
 
 # This shouldn't be necessary, but there has been trouble
 # with MSVC being set off, but MSVCXX ON.
@@ -26,7 +27,7 @@
 if(WIN32 AND NOT CYGWIN)
   set(CMAKE_CONFIG_INSTALL_DIR CMake)
 else()
-  set(CMAKE_CONFIG_INSTALL_DIR ${CMAKE_INSTALL_FULL_LIBDIR}/${PROJECT_NAME}/cmake/)
+  set(CMAKE_CONFIG_INSTALL_DIR ${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}/cmake/)
 endif()
 
 set(PACKAGE_NAME ${PROJECT_NAME})
@@ -37,8 +38,8 @@
 # allow users of gazebo to specify the API or version to depend on
 # TODO: keep this instruction until deprecate Ubuntu/Precise and update with
 # https://github.com/Kitware/CMake/blob/v2.8.8/Modules/CMakePackageConfigHelpers.cmake
-include(WriteBasicConfigVersionFile)
-write_basic_config_version_file(
+include(CMakePackageConfigHelpers)
+write_basic_package_version_file(
   ${CMAKE_CURRENT_BINARY_DIR}/${cmake_conf_version_file}
   VERSION "${URDF_VERSION}"
   COMPATIBILITY SameMajorVersion)
@@ -52,7 +53,7 @@
   set(PACKAGE_DESC "Unified Robot Description Format")
   set(pkg_conf_file "urdfdom_headers.pc")
   configure_file("${CMAKE_CURRENT_SOURCE_DIR}/cmake/pkgconfig/${pkg_conf_file}.in" "${CMAKE_BINARY_DIR}/${pkg_conf_file}" @ONLY)
-  install(FILES "${CMAKE_BINARY_DIR}/${pkg_conf_file}" DESTINATION lib/pkgconfig/ COMPONENT pkgconfig)
+  install(FILES "${CMAKE_BINARY_DIR}/${pkg_conf_file}" DESTINATION share/pkgconfig/ COMPONENT pkgconfig)
 endif()
 
 # Add uninstall target
diff -urN urdfdom_headers-1.0.1/urdf_exception/CMakeLists.txt urdfdom_headers-1.0.1.fedora/urdf_exception/CMakeLists.txt
--- urdfdom_headers-1.0.1/urdf_exception/CMakeLists.txt	2018-02-21 20:16:52.000000000 +0000
+++ urdfdom_headers-1.0.1.fedora/urdf_exception/CMakeLists.txt	2018-11-23 17:58:12.950987171 +0000
@@ -1 +1 @@
-INSTALL(DIRECTORY include/urdf_exception DESTINATION include)
+INSTALL(DIRECTORY include/urdf_exception DESTINATION ${URDF_INCLUDE_DIR})
diff -urN urdfdom_headers-1.0.1/urdf_model/CMakeLists.txt urdfdom_headers-1.0.1.fedora/urdf_model/CMakeLists.txt
--- urdfdom_headers-1.0.1/urdf_model/CMakeLists.txt	2018-02-21 20:16:52.000000000 +0000
+++ urdfdom_headers-1.0.1.fedora/urdf_model/CMakeLists.txt	2018-11-23 17:58:12.950987171 +0000
@@ -1 +1 @@
-INSTALL(DIRECTORY include/urdf_model DESTINATION include)
+INSTALL(DIRECTORY include/urdf_model DESTINATION ${URDF_INCLUDE_DIR})
diff -urN urdfdom_headers-1.0.1/urdf_model_state/CMakeLists.txt urdfdom_headers-1.0.1.fedora/urdf_model_state/CMakeLists.txt
--- urdfdom_headers-1.0.1/urdf_model_state/CMakeLists.txt	2018-02-21 20:16:52.000000000 +0000
+++ urdfdom_headers-1.0.1.fedora/urdf_model_state/CMakeLists.txt	2018-11-23 17:58:12.950987171 +0000
@@ -1 +1 @@
-INSTALL(DIRECTORY include/urdf_model_state DESTINATION include)
+INSTALL(DIRECTORY include/urdf_model_state DESTINATION ${URDF_INCLUDE_DIR})
diff -urN urdfdom_headers-1.0.1/urdf_sensor/CMakeLists.txt urdfdom_headers-1.0.1.fedora/urdf_sensor/CMakeLists.txt
--- urdfdom_headers-1.0.1/urdf_sensor/CMakeLists.txt	2018-02-21 20:16:52.000000000 +0000
+++ urdfdom_headers-1.0.1.fedora/urdf_sensor/CMakeLists.txt	2018-11-23 17:58:12.950987171 +0000
@@ -1 +1 @@
-INSTALL(DIRECTORY include/urdf_sensor DESTINATION include)
+INSTALL(DIRECTORY include/urdf_sensor DESTINATION ${URDF_INCLUDE_DIR})