diff options
| author | Didier Raboud <odyx@debian.org> | 2017-09-11 10:36:38 +0200 |
|---|---|---|
| committer | Didier Raboud <odyx@debian.org> | 2017-09-11 10:48:22 +0200 |
| commit | 6d5710e166f5fbd70688925bdb72940c3c033fc0 (patch) | |
| tree | 7a16347984a711dd5016aae86af091f31f474861 /debian | |
| parent | 4b38b48427b29a2b1d0e17d2859e2c0c923eac57 (diff) | |
| parent | 7c18afb0d02de40da3aa20540516b01fddf904df (diff) | |
merge patched-debian/master into debian/master
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/.git-dpm | 4 | ||||
| -rw-r--r-- | debian/patches/0001-Use-CMAKE_INSTALL-targets.patch | 28 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 31 insertions, 2 deletions
diff --git a/debian/.git-dpm b/debian/.git-dpm index 5c1bd08..1b19576 100644 --- a/debian/.git-dpm +++ b/debian/.git-dpm @@ -1,6 +1,6 @@ # see git-dpm(1) from git-dpm package -fcd6aa3adfacc7914455ccd229682e009a06c447 -fcd6aa3adfacc7914455ccd229682e009a06c447 +7c18afb0d02de40da3aa20540516b01fddf904df +7c18afb0d02de40da3aa20540516b01fddf904df fcd6aa3adfacc7914455ccd229682e009a06c447 fcd6aa3adfacc7914455ccd229682e009a06c447 sdl-kitchensink_0.0.6.orig.tar.xz diff --git a/debian/patches/0001-Use-CMAKE_INSTALL-targets.patch b/debian/patches/0001-Use-CMAKE_INSTALL-targets.patch new file mode 100644 index 0000000..f9c0190 --- /dev/null +++ b/debian/patches/0001-Use-CMAKE_INSTALL-targets.patch @@ -0,0 +1,28 @@ +From 7c18afb0d02de40da3aa20540516b01fddf904df Mon Sep 17 00:00:00 2001 +From: Didier Raboud <odyx@debian.org> +Date: Mon, 11 Sep 2017 10:46:39 +0200 +Subject: Use CMAKE_INSTALL targets + +--- + CMakeLists.txt | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 148c747..33758f3 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -76,10 +76,11 @@ if(BUILD_EXAMPLES) + endif() + + # Installation ++include(GNUInstallDirs) + + INSTALL(FILES ${HEADERS} DESTINATION include/kitchensink/) + INSTALL(TARGETS SDL_kitchensink SDL_kitchensink_static +- RUNTIME DESTINATION bin +- LIBRARY DESTINATION lib +- ARCHIVE DESTINATION lib ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + ) diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..a32d16a --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +0001-Use-CMAKE_INSTALL-targets.patch |