tde_create_translated_desktop: Incorporate a slightly modified version

of intltool-merge 0.51 to properly merge desktop file translations
containing escaped newline characters - '\n'.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>

modules/TDEMacros.cmake

@@ -28,6 +28,8 @@ if( NOT TDE_CMAKE_ROOT )
     # TDE CMake is installed in the system directory
     set( TDE_CMAKE_ROOT ${CMAKE_ROOT}
          CACHE FILEPATH "TDE CMake root" )
+    set( TDE_CMAKE_MODULES ${TDE_CMAKE_ROOT}/Modules
+         CACHE FILEPATH "TDE CMake modules" )
     set( TDE_CMAKE_TEMPLATES ${TDE_CMAKE_ROOT}/Templates
          CACHE FILEPATH "TDE CMake templates" )
 
@@ -37,6 +39,8 @@ if( NOT TDE_CMAKE_ROOT )
     get_filename_component( TDE_CMAKE_ROOT ${CMAKE_CURRENT_LIST_DIR} PATH )
     set( TDE_CMAKE_ROOT ${TDE_CMAKE_ROOT}
          CACHE FILEPATH "TDE CMake root" )
+    set( TDE_CMAKE_MODULES ${TDE_CMAKE_ROOT}/modules
+         CACHE FILEPATH "TDE CMake modules" )
     set( TDE_CMAKE_TEMPLATES ${TDE_CMAKE_ROOT}/templates
          CACHE FILEPATH "TDE CMake templates" )
 
@@ -1869,10 +1873,13 @@ macro( tde_create_translated_desktop )
   #endif( )
   #if( "${MSGFMT_VERSION}" VERSION_LESS "0.19" )
   if( TRUE )
+    if( NOT PERL_EXECUTABLE )
+      include( FindPerl )
+    endif( )
     if( NOT INTLTOOL_MERGE_EXECUTABLE )
       find_program( INTLTOOL_MERGE_EXECUTABLE
-        NAMES intltool-merge
+        NAMES tde_l10n_merge.pl
-        HINTS "${TDE_PREFIX}/bin"
+        HINTS ${TDE_CMAKE_MODULES}
       )
       if( "${INTLTOOL_MERGE_EXECUTABLE}" STREQUAL "INTLTOOL_MERGE_EXECUTABLE-NOTFOUND" )
         #tde_message_fatal( "xgettext >= 0.19 or intltool-merge is required but not found" )
@@ -2004,7 +2011,7 @@ macro( tde_create_translated_desktop )
           # merge translations command
           add_custom_command(
             OUTPUT ${_basename}
-            COMMAND ${INTLTOOL_MERGE_EXECUTABLE} -q -d ${_po_dir} ${_basename}.in ${_basename}
+            COMMAND ${PERL_EXECUTABLE} ${INTLTOOL_MERGE_EXECUTABLE} -q -d ${_po_dir} ${_basename}.in ${_basename}
             DEPENDS ${_src}
             COMMENT "Merging translations into ${_sourcename}"
           )