diff options
| author | Daniel Glassey <wdg@debian.org> | 2015-09-07 15:56:03 +0100 |
|---|---|---|
| committer | Daniel Glassey <wdg@debian.org> | 2015-09-07 15:56:03 +0100 |
| commit | aefdb0abced935bcec17bce5bc6652f63486c665 (patch) | |
| tree | cdff5ad02a32fd8516459bef1b1e4445453a7e8a /debian/patches | |
| parent | 1139612871467b0d1c31c2b208575b5b8228f31d (diff) | |
multiarch enable
Diffstat (limited to 'debian/patches')
| -rw-r--r-- | debian/patches/multiarch.patch | 34 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
2 files changed, 35 insertions, 0 deletions
diff --git a/debian/patches/multiarch.patch b/debian/patches/multiarch.patch new file mode 100644 index 0000000..2dc94e7 --- /dev/null +++ b/debian/patches/multiarch.patch @@ -0,0 +1,34 @@ +Description: install to multiarch locations +Author: Daniel Glassey <wdg@debian.org> + +Index: sword-1.7.3+dfsg/cmake/install.cmake +=================================================================== +--- sword-1.7.3+dfsg.orig/cmake/install.cmake 2015-09-02 00:23:45.451613059 +0100 ++++ sword-1.7.3+dfsg/cmake/install.cmake 2015-09-02 00:24:49.763931921 +0100 +@@ -5,17 +5,17 @@ + # Configuration files, of course + SET(prefix "${PREFIX}") + SET(exec_prefix "${PREFIX}") +-SET(libdir "${LIBDIR}") ++SET(libdir "${LIBDIR}/${CMAKE_LIBRARY_ARCHITECTURE}") + SET(includedir "${INCLUDEDIR}") + + # Install the library + IF(BUILDING_SHARED) + INSTALL(TARGETS sword +- DESTINATION "${LIBDIR}") ++ DESTINATION "${LIBDIR}/${CMAKE_LIBRARY_ARCHITECTURE}") + ENDIF(BUILDING_SHARED) + IF(BUILDING_STATIC) + INSTALL(TARGETS sword_static +- DESTINATION "${LIBDIR}") ++ DESTINATION "${LIBDIR}/${CMAKE_LIBRARY_ARCHITECTURE}") + ENDIF(BUILDING_STATIC) + # Install the locales + INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/locales.d +@@ -53,4 +53,4 @@ + CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/include/swversion.h.in ${CMAKE_CURRENT_BINARY_DIR}/include/swversion.h @ONLY) + + INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/sword.pc +- DESTINATION "${LIBDIR}/pkgconfig") ++ DESTINATION "${LIBDIR}/${CMAKE_LIBRARY_ARCHITECTURE}/pkgconfig") diff --git a/debian/patches/series b/debian/patches/series index 4ead391..c133da1 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -11,3 +11,4 @@ multiarch-clucene.patch no-included-zconf.h.diff dso-missing-shared.patch abicompare.patch +multiarch.patch |