diff options
| author | Teus Benschop <teusjannette@gmail.com> | 2018-10-17 14:32:16 +0200 |
|---|---|---|
| committer | Teus Benschop <teusjannette@gmail.com> | 2018-10-17 14:32:16 +0200 |
| commit | 4aa4dcc2f96582849d9026bfd267c5138db5b597 (patch) | |
| tree | fd56dd6eab074d5d578f3d0488866e827eccb1b9 /debian/patches | |
| parent | daa1645ddf28980f33ae5c58d3ce6d1c908cc22b (diff) | |
debian/patches/multiarch: removed
Diffstat (limited to 'debian/patches')
| -rw-r--r-- | debian/patches/multiarch.patch | 34 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
2 files changed, 0 insertions, 35 deletions
diff --git a/debian/patches/multiarch.patch b/debian/patches/multiarch.patch deleted file mode 100644 index 2dc94e7..0000000 --- a/debian/patches/multiarch.patch +++ /dev/null @@ -1,34 +0,0 @@ -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 fc9b014..aca6c78 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -4,7 +4,6 @@ sword-TEI-images.patch multiarch-clucene.patch no-included-zconf.h.diff abicompare.patch -multiarch.patch selectively_disable_compiler_warnings.patch runtests.patch sword-ppc64.patch |