Midori Web Browser

Merge lp:~midori/midori/mofiles into lp:midori

  1. mofiles
  2. Merge into trunk
Proposed by Cris Dywan
Status: Merged
Approved by: Paweł Forysiuk
Approved revision: 6413
Merged at revision: 6415
Proposed branch: lp:~midori/midori/mofiles
Merge into: lp:midori
Diff against target: 28 lines (+5/-2)
2 files modified
CMakeLists.txt (+1/-1)
po/CMakeLists.txt (+4/-1)
To merge this branch: bzr merge lp:~midori/midori/mofiles
Reviewer Review Type Date Requested Status
Paweł Forysiuk Approve
Review via email: mp+187921@code.launchpad.net

Commit message

Install mo files in locale dir

To post a comment you must log in.
Revision history for this message
Paweł Forysiuk (tuxator) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2013-09-22 14:40:37 +0000
3+++ CMakeLists.txt 2013-09-26 21:33:16 +0000
4@@ -38,7 +38,7 @@
5 add_definitions("-DDOCDIR=\"${CMAKE_INSTALL_FULL_DOCDIR}\"")
6
7 add_definitions("-DENABLE_NLS=1")
8-add_definitions("-DLOCALEDIR=\"${CMAKE_INSTALL_LOCALEDIR}\"")
9+add_definitions("-DLOCALEDIR=\"${CMAKE_INSTALL_FULL_LOCALEDIR}\"")
10
11 file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/config.h" "/* # generated file (stub) */")
12 add_definitions("-DHAVE_CONFIG_H=1")
13
14=== modified file 'po/CMakeLists.txt'
15--- po/CMakeLists.txt 2013-09-08 22:03:43 +0000
16+++ po/CMakeLists.txt 2013-09-26 21:33:16 +0000
17@@ -10,7 +10,10 @@
18 message(STATUS "gettext found: ${LANGUAGES}")
19 string(REPLACE " " ";" LANGUAGES ${LANGUAGES})
20 foreach(LANG ${LANGUAGES})
21- GETTEXT_PROCESS_PO_FILES(${LANG} ALL PO_FILES "${LANG}.po")
22+ GETTEXT_PROCESS_PO_FILES(${LANG} ALL)
23+ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${LANG}.gmo"
24+ DESTINATION "${CMAKE_INSTALL_FULL_LOCALEDIR}/${LANG}/LC_MESSAGES"
25+ RENAME "${GETTEXT_PACKAGE}.mo")
26 endforeach ()
27 else ()
28 message(STATUS "gettext not found")

Subscribers

People subscribed via source and target branches

to all changes: