X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=development%2Fcmake%2FInstall.cmake;h=fd8f1a55cc44f2c55023f6c19eb20a040b09992e;hb=56e0cfd582387e0e953c5d818fd68454bc133090;hp=61c6213d54684e420b1fe9a83435d8be8a4e1d70;hpb=fbdafecf52c75c978d623fa9db3c49907d231fdc;p=lyx.git

diff --git a/development/cmake/Install.cmake b/development/cmake/Install.cmake
index 61c6213d54..fd8f1a55cc 100755
--- a/development/cmake/Install.cmake
+++ b/development/cmake/Install.cmake
@@ -2,12 +2,13 @@
 # TODO: set correct path in call to cmake
 # e.g. cmake /usr/src/lyx/lyx-devel/development/cmake -DCMAKE_INSTALL_PREFIX=/usr/local/share/lyx2.0 -Dnls=1
 
-message(STATUS "installing to ${CMAKE_INSTALL_PREFIX}, defined by CMAKE_INSTALL_PREFIX")
+message(STATUS "Installing to ${CMAKE_INSTALL_PREFIX}, defined by CMAKE_INSTALL_PREFIX")
 
 # the macro scans the directories "_parent_src_dir/_dir/_current_dir" for *._file_type files
 # and installs the files in CMAKE_INSTALL_PREFIX/_current_dir
 # dir_item is on item of the remaining arguments
 macro(lyx_install _parent_src_dir _gl_dir _file_type)
+  #message("checking parents ${_parent_src_dir}")
   file(GLOB _dirs RELATIVE "${_parent_src_dir}" ${_parent_src_dir}/${_gl_dir})
   #cmake bug on Windows: if _gl_dir==. _dirs is empty but on linux _dirs==.
   if(NOT _dirs)
@@ -17,10 +18,9 @@ macro(lyx_install _parent_src_dir _gl_dir _file_type)
     foreach(_glob_dir ${ARGN})
       file(GLOB _dir_list ${_parent_src_dir}/${_dir}/${_glob_dir})
       if(NOT _dir_list)
-        set(_dir_list ${_parent_src_dir}/${_dir})
-      endif() 
-      if(_glob_dir STREQUAL ".")
-        set(_dir_list ${_parent_src_dir}/${_dir}/.)
+        if(_glob_dir STREQUAL ".")
+          set(_dir_list ${_parent_src_dir}/${_dir}/.)
+        endif()
       endif()
       #message(STATUS "${_dir}/${_glob_dir} -> ${_dir_list} ")
       foreach(_current_dir ${_dir_list})
@@ -43,9 +43,9 @@ macro(lyx_install _parent_src_dir _gl_dir _file_type)
           if(_glob_dir STREQUAL ".")
             set(_base_dir .)
           endif()
-          #message(STATUS "install ${_dir}/${_base_dir}: ${files_list} ")
-          #message(STATUS "install at ${CMAKE_INSTALL_PREFIX}/${_dir}/${_base_dir}")
-          install(FILES ${files_list} DESTINATION ${_dir}/${_base_dir})
+          #message(STATUS "install ${LYX_DATA_SUBDIR}${_dir}/${_base_dir}: ${files_list} ")
+          #message(STATUS "install at ${CMAKE_INSTALL_PREFIX}/${LYX_DATA_SUBDIR}${_dir}/${_base_dir}")
+          install(FILES ${files_list} DESTINATION ${LYX_DATA_SUBDIR}${_dir}/${_base_dir})
         endif()
       endforeach(_current_dir)
     endforeach(_glob_dir)
@@ -78,5 +78,3 @@ lyx_install(${TOP_SRC_DIR}/lib tex          *      .)
 lyx_install(${TOP_SRC_DIR}/lib ui           *      .)
 lyx_install(${TOP_SRC_DIR}/lib .            *      .)
 
-install(PROGRAMS ${TOP_SRC_DIR}/lib/lyx2lyx/lyx2lyx DESTINATION lyx2lyx)
-