From 9e59633bc93911f2331d1b7b838686e8232de653 Mon Sep 17 00:00:00 2001 From: Alan Knowles Date: Fri, 17 May 2019 10:51:38 +0800 Subject: [PATCH] fix correct paths for all files --- debian/rules | 4 ++-- roojspacker/CMakeLists.txt | 8 ++------ 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/debian/rules b/debian/rules index f0932a5..887094a 100755 --- a/debian/rules +++ b/debian/rules @@ -23,6 +23,6 @@ # dh_make generated override targets # This is example for Cmake (See https://bugs.debian.org/641051 ) -#override_dh_auto_configure: -# dh_auto_configure -- -DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH) -DCMAKE_INSTALL_BINDIR=$(DEB_HOST_MULTIARCH)/bin -DCMAKE_INSTALL_LIBDIR=$(DEB_HOST_MULTIARCH)/lib +override_dh_auto_configure: + dh_auto_configure -- -DCMAKE_INSTALL_DATADIR=share -DCMAKE_INSTALL_INCLUDEDIR=include/roojspacker diff --git a/roojspacker/CMakeLists.txt b/roojspacker/CMakeLists.txt index 8338a36..ff8e225 100644 --- a/roojspacker/CMakeLists.txt +++ b/roojspacker/CMakeLists.txt @@ -138,20 +138,16 @@ install ( # DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/) INSTALL (FILES ${CMAKE_CURRENT_BINARY_DIR}/${ROOJSPACKER_PKG_NAME}.h - DESTINATION include) + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) -# Install our VAPI -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${ROOJSPACKER_PKG_NAME}.vapi - DESTINATION ${CMAKE_INSTALL_DATADIR}/vala/vapi) - # Generate and install a pkg-config file configure_file ( "${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/${ROOJSPACKER_PKG_NAME}.pc" @ONLY) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${ROOJSPACKER_PKG_NAME}.pc - DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) + DESTINATION ${CMAKE_INSTALL_DATADIR}/pkgconfig) # Generate documentation #find_package(Valadoc) -- 2.39.2