tjh.dev
1--- a/build/cmake/aom_install.cmake
2+++ b/build/cmake/aom_install.cmake
3@@ -45,2 +45,2 @@ macro(setup_aom_install_targets)
4- -DCMAKE_INSTALL_INCLUDEDIR=${CMAKE_INSTALL_INCLUDEDIR}
5- -DCMAKE_INSTALL_LIBDIR=${CMAKE_INSTALL_LIBDIR}
6+ -DCMAKE_INSTALL_FULL_INCLUDEDIR=${CMAKE_INSTALL_FULL_INCLUDEDIR}
7+ -DCMAKE_INSTALL_FULL_LIBDIR=${CMAKE_INSTALL_FULL_LIBDIR}
8@@ -82,14 +82,14 @@ macro(setup_aom_install_targets)
9 install(
10 FILES ${AOM_INSTALL_INCS}
11- DESTINATION "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}/aom")
12+ DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}/aom")
13 install(
14 FILES "${AOM_PKG_CONFIG_FILE}"
15- DESTINATION "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/pkgconfig")
16+ DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}/pkgconfig")
17 install(TARGETS ${AOM_INSTALL_LIBS} DESTINATION
18- "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
19+ "${CMAKE_INSTALL_FULL_LIBDIR}")
20
21 if(ENABLE_EXAMPLES)
22 install(TARGETS ${AOM_INSTALL_BINS} DESTINATION
23- "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}")
24+ "${CMAKE_INSTALL_FULL_BINDIR}")
25 endif()
26 endif()
27--- a/build/cmake/pkg_config.cmake
28+++ b/build/cmake/pkg_config.cmake
29@@ -14,2 +14,2 @@
30- "CMAKE_INSTALL_BINDIR" "CMAKE_INSTALL_INCLUDEDIR"
31- "CMAKE_INSTALL_LIBDIR" "CMAKE_PROJECT_NAME"
32+ "CMAKE_INSTALL_BINDIR" "CMAKE_INSTALL_FULL_INCLUDEDIR"
33+ "CMAKE_INSTALL_FULL_LIBDIR" "CMAKE_PROJECT_NAME"
34@@ -38,4 +38,4 @@ endif()
35-set(prefix "${CMAKE_INSTALL_PREFIX}")
36-set(bindir "${CMAKE_INSTALL_BINDIR}")
37-set(includedir "${CMAKE_INSTALL_INCLUDEDIR}")
38-set(libdir "${CMAKE_INSTALL_LIBDIR}")
39+get_filename_component(prefix "${CMAKE_INSTALL_FULL_INCLUDEDIR}" DIRECTORY)
40+get_filename_component(exec_prefix "${CMAKE_INSTALL_FULL_LIBDIR}" DIRECTORY)
41+get_filename_component(includedir "${CMAKE_INSTALL_FULL_INCLUDEDIR}" NAME)
42+get_filename_component(libdir "${CMAKE_INSTALL_FULL_LIBDIR}" NAME)
43@@ -46 +46 @@ file(APPEND "${pkgconfig_file}" "prefix=${prefix}\n")
44-file(APPEND "${pkgconfig_file}" "exec_prefix=\${prefix}\n")
45+file(APPEND "${pkgconfig_file}" "exec_prefix=${exec_prefix}\n")