Re: lyx.desktop.in with absolute paths

[Kornel Benko]

Am Dienstag, 6. Mai 2014 um 21:35:23, schrieb Enrico Forestieri <for...@lyx.org>
> On Tue, May 06, 2014 at 08:44:18PM +0200, Kornel Benko wrote:
> > 
> > I cannot get it to be shown in menu.
> 
> Most probably you have problems with the PATH used by your desktop
> environment. Try removing the "TryExec=" line from the .dekstop
> file and check whether that makes it appear.
> 

It was the PATH. I added it now to ~/.pam_environment. After re-login it was
in the menu.

Thanks Enrico.

The attached is now working for me.

        Kornel
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8ab1bea..2a2e440 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -373,13 +373,14 @@ if(LYX_INSTALL_PREFIX)
 endif()
 set(LYX_INSTALL_PREFIX ${LYX_INSTALL_PREFIX} CACHE PATH "LyX user's choice install prefix" FORCE)
 
+string(REGEX REPLACE "/lyx${LYX_INSTALL_SUFFIX}$" "/share" DATADIR ${CMAKE_INSTALL_PREFIX})
+
 if(LYX_PACKAGE_SUFFIX)
 	set(PACKAGE ${PACKAGE_BASE}${LYX_INSTALL_SUFFIX})
 else()
 	set(PACKAGE ${PACKAGE_BASE})
 endif()
 
-
 if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
 	# see http://www.cmake.org/pipermail/cmake/2006-October/011559.html
 	if (UNIX)
diff --git a/development/cmake/Install.cmake b/development/cmake/Install.cmake
index 446d9f6..415bf22 100755
--- a/development/cmake/Install.cmake
+++ b/development/cmake/Install.cmake
@@ -113,6 +113,6 @@ if(APPLE)
 elseif(UNIX)
   set(program_suffix ${PROGRAM_SUFFIX})
   configure_file(${TOP_SRC_DIR}/lib/lyx.desktop.in lyx${PROGRAM_SUFFIX}.desktop)
-  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/lyx${PROGRAM_SUFFIX}.desktop DESTINATION applications)
-  install(FILES ${TOP_SRC_DIR}/lib/images/lyx.svg RENAME lyx${PROGRAM_SUFFIX}.svg DESTINATION images)
+  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/lyx${PROGRAM_SUFFIX}.desktop DESTINATION ${DATADIR}/applications)
+  install(FILES ${TOP_SRC_DIR}/lib/images/lyx.svg RENAME lyx${PROGRAM_SUFFIX}.svg DESTINATION ${DATADIR}/icons/hicolor/scalable/apps/)
 endif()

signature.asc
Description: This is a digitally signed message part.