trinity-devel@lists.pearsoncomputing.net

Message: previous - next
Month: May 2012

Re: [trinity-devel] Mysterious hard-coding

From: Darrell Anderson <humanreadable@...>
Date: Tue, 29 May 2012 11:51:55 -0700 (PDT)
> I am fairly certain that what you are looking for is in the
> file cmake/modules/TDESetupPaths.cmake, specifically the line
> which sets XDG_APPS_INSTALL_DIR
> 
> tde-config is generate from tdecore/tde-config.cpp.cmake,
> which uses
> XDG_APPS_INSTALL_DIR as defined during the build process.

> There is a second hardcode for the Autotools build system
> in admin/acinclude.m4.in, line 535.  It looks like this:
> xdg_appsdir='\${datadir}/applications/kde'


Yes, I have both of those locations covered in my master build script snippet. I just generated individual patches for each module. The tdelibs patch looks like this:

diff -urN tdelibs/admin/acinclude.m4.in tdelibs.new/admin/acinclude.m4.in
--- tdelibs/admin/acinclude.m4.in	2012-05-10 15:54:53.000000000 -0500
+++ tdelibs.new/admin/acinclude.m4.in	2012-05-29 13:12:09.413139614 -0500
@@ -532,7 +532,7 @@
     kde_widgetdir='\${libdir}/trinity/plugins/designer'
   fi
   if test -z "$xdg_appsdir"; then
-    xdg_appsdir='\${datadir}/applications/kde'
+    xdg_appsdir='\${datadir}/applications/tde'
   fi
   if test -z "$xdg_menudir"; then
     xdg_menudir='\${sysconfdir}/xdg/menus'
diff -urN tdelibs/cmake/modules/TDESetupPaths.cmake tdelibs.new/cmake/modules/TDESetupPaths.cmake
--- tdelibs/cmake/modules/TDESetupPaths.cmake	2012-05-10 15:54:52.000000000 -0500
+++ tdelibs.new/cmake/modules/TDESetupPaths.cmake	2012-05-29 13:12:09.840143049 -0500
@@ -61,7 +61,7 @@
   _tde_internal_setup_path( INFO_INSTALL_DIR          "${SHARE_INSTALL_PREFIX}/info"                "The info install dir (default ${SHARE_INSTALL_PREFIX}/info)" )
 
   _tde_internal_setup_path( XDG_MENU_INSTALL_DIR      "${SYSCONF_INSTALL_DIR}/xdg/menus"            "The XDG menus dir" )
-  _tde_internal_setup_path( XDG_APPS_INSTALL_DIR      "${SHARE_INSTALL_PREFIX}/applications/kde"    "The XDG apps dir" )
+  _tde_internal_setup_path( XDG_APPS_INSTALL_DIR      "${SHARE_INSTALL_PREFIX}/applications/tde"    "The XDG apps dir" )
   _tde_internal_setup_path( XDG_DIRECTORY_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/desktop-directories" "The XDG directory" )
   _tde_internal_setup_path( XDG_MIME_INSTALL_DIR      "${SHARE_INSTALL_PREFIX}/mime/packages"       "The install dir for the xdg mimetypes" )
 


Darrell