SF.net SVN: jazzplusplus:[637] trunk/jazz/src

[<pst...@us...>]

Revision: 637
          http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=637&view=rev
Author:   pstieber
Date:     2008-11-17 21:52:03 +0000 (Mon, 17 Nov 2008)

Log Message:
-----------
Changed the HelpFile directory installation on Linux to prefix/share/Jazz++/HelpFiles.

Modified Paths:
--------------
    trunk/jazz/src/HelpFiles/Makefile.am
    trunk/jazz/src/HelpFiles/images/Makefile.am
    trunk/jazz/src/JazzPlusPlusApplication.cpp

Modified: trunk/jazz/src/HelpFiles/Makefile.am
===================================================================
--- trunk/jazz/src/HelpFiles/Makefile.am	2008-11-17 19:38:17 UTC (rev 636)
+++ trunk/jazz/src/HelpFiles/Makefile.am	2008-11-17 21:52:03 UTC (rev 637)
@@ -10,7 +10,7 @@
 
 libphony_a_SOURCES = jazz.tex
 
-helpdir = ${prefix}/bin/HelpFiles
+helpdir = ${prefix}/share/Jazz++/HelpFiles
 
 make-install-dirs:
 	-if test '!' -d $(helpdir); then mkdir -p $(helpdir); fi

Modified: trunk/jazz/src/HelpFiles/images/Makefile.am
===================================================================
--- trunk/jazz/src/HelpFiles/images/Makefile.am	2008-11-17 19:38:17 UTC (rev 636)
+++ trunk/jazz/src/HelpFiles/images/Makefile.am	2008-11-17 21:52:03 UTC (rev 637)
@@ -1,4 +1,4 @@
-helpimagesdir = ${prefix}/bin/HelpFiles/images
+helpimagesdir = ${prefix}/share/Jazz++/HelpFiles/images
 
 make-install-dirs :
 	-if test '!' -d $(helpimagesdir); then mkdir -p $(helpimagesdir); fi

Modified: trunk/jazz/src/JazzPlusPlusApplication.cpp
===================================================================
--- trunk/jazz/src/JazzPlusPlusApplication.cpp	2008-11-17 19:38:17 UTC (rev 636)
+++ trunk/jazz/src/JazzPlusPlusApplication.cpp	2008-11-17 21:52:03 UTC (rev 637)
@@ -159,14 +159,14 @@
   // Show it and tell the application that it's our main window
   SetTopWindow(mpTrackFrame);
 
-  // Get the current working directory and append a directory separator.
-  wxString CurrentWorkingDirectory =
-    ::wxGetCwd() + wxFileName::GetPathSeparator();
-
   // This code should be distributed with a HelpFiles subdirectory under
-  // the directory the executable is stored in.
+  // the directory the executable is stored in on Windows and under the
+  // ${prefix}/shared/${appname} on Linux.
   wxString HelpFileDirectoryGuess =
-    CurrentWorkingDirectory + "HelpFiles" + wxFileName::GetPathSeparator();
+    wxStandardPaths::Get().GetDataDir() +
+    wxFileName::GetPathSeparator() +
+    "HelpFiles" +
+    wxFileName::GetPathSeparator();
 
   // Attempt to obtain the path to the help file from configuration data.
   wxString HelpFilePath;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.