X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=development%2Fcmake%2FInstall.cmake;h=10a7a7e23e9a954da3cdf6e2d7c1bf1a36f39552;hb=7f32b02306b846ee1aba2836ebbd03fc3db9fd28;hp=b3b06badbac3df0fdeec68213250d8f20b04ef9e;hpb=33e74e51174a692a36ff3d9ccac1cd979e9b9dab;p=features.git

diff --git a/development/cmake/Install.cmake b/development/cmake/Install.cmake
index b3b06badba..10a7a7e23e 100755
--- a/development/cmake/Install.cmake
+++ b/development/cmake/Install.cmake
@@ -24,7 +24,8 @@ macro(lyx_install _what _parent_src_dir _gl_dir _file_type)
   if(NOT _dirs)
     set(_dirs .)
   endif()
-  # Select installation dir
+  # Select installation dir(s)
+  # Mark, that _dest_subdir may be a list
   if ("${_what}" STREQUAL "data")
     get_data_destination(_dest_subdir)
   elseif ("${_what}" STREQUAL "font")
@@ -78,8 +79,10 @@ macro(lyx_install _what _parent_src_dir _gl_dir _file_type)
             set(_base_dir .)
           endif()
 
-          install(FILES ${files_list} DESTINATION "${_dest_subdir}${_dir}/${_base_dir}")
-          #message(STATUS "Installing  ${files_list} to ${_dest_subdir}${_dir}/${_base_dir}")
+	  foreach(_dst ${_dest_subdir})
+	    install(FILES ${files_list} DESTINATION "${_dst}${_dir}/${_base_dir}")
+	    #message(STATUS "Installing  ${files_list} to ${_dest_subdir}${_dir}/${_base_dir}")
+	  endforeach()
         endif()
         if(program_list)
           if(_glob_dir STREQUAL ".")
@@ -120,13 +123,19 @@ endforeach()
 foreach(_sd "lyx2lyx" "scripts" ".")
   lyx_install("data" ${TOP_SRC_DIR}/lib ${_sd}     *.py .  )
 endforeach()
+foreach(_script listerrors)
+  lyx_install("data" ${TOP_SRC_DIR}/lib scripts ${_script} . )
+endforeach()
+
 
 foreach(_imgext "png" "svgz" "gif" "xpm")
-  lyx_install("data" ${TOP_SRC_DIR}/lib images       "*.${_imgext}"      . ipa classic oxygen)
+  lyx_install("data" ${TOP_SRC_DIR}/lib images       "*.${_imgext}"      . bullets ipa classic oxygen)
   lyx_install("data" ${TOP_SRC_DIR}/lib images/math  "*.${_imgext}"      . oxygen)
 endforeach()
 lyx_install("data" ${TOP_SRC_DIR}/lib        citeengines          *.citeengine .)
 lyx_install("data" ${TOP_SRC_DIR}/lib        scripts              *.R          .)
+lyx_install("data" ${TOP_SRC_DIR}/lib        scripts              saxon*.*     .)
+lyx_install("data" ${TOP_SRC_DIR}/lib        docbook              *            . epub3 xhtml5 xhtml lib common)
 lyx_install("data" ${TOP_SRC_DIR}/lib        xtemplates           *.xtemplate  .)
 lyx_install("data" ${TOP_SRC_DIR}/3rdparty   scripts/evince_sync  *            .)
 lyx_install("font" ${TOP_SRC_DIR}/lib/fonts  .                    *            .)
@@ -143,7 +152,7 @@ if(APPLE)
     install(FILES "${TOP_SRC_DIR}/development/MacOSX/PkgInfo" DESTINATION "${MACOSX_BUNDLE_STARTUP_COMMAND}/Contents")
   endif()
 
-  foreach(_i lyxeditor maxima inkscape)
+  foreach(_i lyxeditor maxima inkscape lilypond lilypond-book)
     install(PROGRAMS "${TOP_SRC_DIR}/development/MacOSX/${_i}" DESTINATION "${LYX_UTILITIES_INSTALL_PATH}")
   endforeach()
   install(FILES "${TOP_SRC_DIR}/development/MacOSX/LyX.icns" DESTINATION "${LYX_DATA_SUBDIR}")
@@ -158,6 +167,9 @@ elseif(CYGWIN)
 elseif(WIN32)
   set(lyxrcorig "${TOP_SRC_DIR}/development/Win32/lyxrc.dist.in")
 endif()
+foreach(_file lyx.svg icon.aliases)
+  install(FILES ${TOP_SRC_DIR}/lib/images/${_file} DESTINATION ${LYX_DATA_SUBDIR}/images/)
+endforeach()
 
 if(NOT lyxrcorig STREQUAL "")
   configure_file("${lyxrcorig}" lyxrc.dist)