Otherwise make DESTDIR=... install will not function properly. Signed-off-by: Emil Velikov <emil.l.veli...@gmail.com> --- CMakeLists.txt | 4 ++-- doc/CMakeLists.txt | 4 ++-- examples/CMakeLists.txt | 2 +- include/CMakeLists.txt | 2 +- man/html.cmake | 2 +- man/manpages.cmake | 6 +++--- src/waffle/CMakeLists.txt | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt index ba6af40..d8d234d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -93,10 +93,10 @@ endif() configure_file(waffle.pc.in ${waffle_libname}.pc @ONLY) install(FILES ${CMAKE_BINARY_DIR}/${waffle_libname}.pc - DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/pkgconfig) + DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) install(FILES cmake/Modules/FindWaffle.cmake - DESTINATION "${CMAKE_INSTALL_FULL_DATAROOTDIR}/cmake/Modules") + DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/cmake/Modules") # ------------------------------------------------------------------------------ diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt index 9b414f0..b89fde3 100644 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -1,7 +1,7 @@ install(FILES "${CMAKE_SOURCE_DIR}/README.txt" "${CMAKE_SOURCE_DIR}/LICENSE.txt" - DESTINATION "${CMAKE_INSTALL_FULL_DOCDIR}") + DESTINATION "${CMAKE_INSTALL_DOCDIR}") install(DIRECTORY "${CMAKE_SOURCE_DIR}/doc/release-notes" - DESTINATION "${CMAKE_INSTALL_FULL_DOCDIR}" + DESTINATION "${CMAKE_INSTALL_DOCDIR}" FILES_MATCHING PATTERN "waffle-${waffle_major_version}.${waffle_minor_version}.*.txt") diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index 48147f9..410bbf8 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -1,7 +1,7 @@ install(FILES Makefile.example gl_basic.c simple-x11-egl.c - DESTINATION "${CMAKE_INSTALL_FULL_DOCDIR}/examples") + DESTINATION "${CMAKE_INSTALL_DOCDIR}/examples") # ---------------------------------------------------------------------------- # Target: simple-x11-egl (executable) diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt index eb1136d..0123c28 100644 --- a/include/CMakeLists.txt +++ b/include/CMakeLists.txt @@ -8,4 +8,4 @@ install(FILES waffle/waffle.h waffle/waffle_version.h waffle/waffle_wayland.h waffle/waffle_x11_egl.h - DESTINATION ${CMAKE_INSTALL_FULL_INCLUDEDIR}/${waffle_libname}) + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${waffle_libname}) diff --git a/man/html.cmake b/man/html.cmake index dd1062c..ea55600 100644 --- a/man/html.cmake +++ b/man/html.cmake @@ -93,4 +93,4 @@ add_custom_target(html ) install(DIRECTORY ${html_out_dir} - DESTINATION ${CMAKE_INSTALL_FULL_DOCDIR}/html) + DESTINATION ${CMAKE_INSTALL_DOCDIR}/html) diff --git a/man/manpages.cmake b/man/manpages.cmake index ee80156..1332eb9 100644 --- a/man/manpages.cmake +++ b/man/manpages.cmake @@ -93,8 +93,8 @@ add_custom_target(man ) install(DIRECTORY ${man_out_dir}/man1 - DESTINATION ${CMAKE_INSTALL_FULL_MANDIR}) + DESTINATION ${CMAKE_INSTALL_MANDIR}) install(DIRECTORY ${man_out_dir}/man3 - DESTINATION ${CMAKE_INSTALL_FULL_MANDIR}) + DESTINATION ${CMAKE_INSTALL_MANDIR}) install(DIRECTORY ${man_out_dir}/man7 - DESTINATION ${CMAKE_INSTALL_FULL_MANDIR}) + DESTINATION ${CMAKE_INSTALL_MANDIR}) diff --git a/src/waffle/CMakeLists.txt b/src/waffle/CMakeLists.txt index 69968d1..10a0241 100644 --- a/src/waffle/CMakeLists.txt +++ b/src/waffle/CMakeLists.txt @@ -176,7 +176,7 @@ set_target_properties(${waffle_libname} ) install(TARGETS ${waffle_libname} - LIBRARY DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}) + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) # ---------------------------------------------------------------------------- # Target: waffle_static -- 1.9.3 _______________________________________________ waffle mailing list waffle@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/waffle