X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=development%2Fcmake%2Fmodules%2FFindLyXGettext.cmake;h=d70b9bc0d8877265d944333d7eabc7c9d677330e;hb=3f771c96d3ec4a7eaa70fae6af0c1c55647d9d50;hp=2105068849ff41d678b7fb3e236c9769abda6738;hpb=0cd8c03d17b00cfd0ed9403205abbe2c112855ae;p=lyx.git

diff --git a/development/cmake/modules/FindLyXGettext.cmake b/development/cmake/modules/FindLyXGettext.cmake
index 2105068849..d70b9bc0d8 100755
--- a/development/cmake/modules/FindLyXGettext.cmake
+++ b/development/cmake/modules/FindLyXGettext.cmake
@@ -35,12 +35,14 @@ MACRO(GETTEXT_CREATE_TRANSLATIONS _potFile _firstPoFile)
    GET_FILENAME_COMPONENT(_absPotFile ${_potFile} ABSOLUTE)
 
    SET(_addToAll)
+   set(_firstArg)
    IF(${_firstPoFile} STREQUAL "ALL")
       SET(_addToAll "ALL")
-      SET(_firstPoFile)
+   else()
+      set(_firstArg ${_firstPoFile})
    ENDIF(${_firstPoFile} STREQUAL "ALL")
 
-   FOREACH (_currentPoFile ${ARGN})
+   FOREACH (_currentPoFile ${_firstArg} ${ARGN})
       GET_FILENAME_COMPONENT(_absFile ${_currentPoFile} ABSOLUTE)
       GET_FILENAME_COMPONENT(_abs_PATH ${_absFile} PATH)
       GET_FILENAME_COMPONENT(_lang ${_absFile} NAME_WE)
@@ -49,11 +51,12 @@ MACRO(GETTEXT_CREATE_TRANSLATIONS _potFile _firstPoFile)
       ADD_CUSTOM_COMMAND( 
          OUTPUT ${_gmoFile} 
          COMMAND ${GETTEXT_MSGMERGE_EXECUTABLE} --quiet --update --backup=none ${_absFile} ${_absPotFile}
-         COMMAND ${GETTEXT_MSGFMT_EXECUTABLE} -c --statistics -o ${_gmoFile} ${_absFile}
-         DEPENDS ${_absPotFile} ${_absFile} 
+         COMMAND ${GETTEXT_MSGFMT_EXECUTABLE} -c --statistics -o ${_gmoFile}.1 ${_absFile}
+         COMMAND ${CMAKE_COMMAND} -E rename ${_gmoFile}.1 ${_gmoFile}
+         DEPENDS ${_absPotFile} ${_absFile}
       )
 
-      INSTALL(FILES ${_gmoFile} DESTINATION ${LYX_DATA_SUBDIR}${LYX_LOCALEDIR}/${_lang}/LC_MESSAGES RENAME ${_potBasename}.mo) 
+      INSTALL(FILES ${_gmoFile} DESTINATION ${LYX_DATA_SUBDIR}${LYX_LOCALEDIR}/${_lang}/LC_MESSAGES RENAME ${_potBasename}.mo)
       SET(_gmoFiles ${_gmoFiles} ${_gmoFile})
 
    ENDFOREACH (_currentPoFile )