r1944: *** empty log message ***

[ctsim.git] / src / ctsim.cpp

diff --git a/src/ctsim.cpp b/src/ctsim.cpp
index 40a1ff452aef7ec76aa2971b81e61ddab64e8894..08dc513b7661690632407920f87e895040b7a176 100644 (file)
--- a/src/ctsim.cpp
+++ b/src/ctsim.cpp
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (c) 1983-2001 Kevin Rosenberg
 **
-**  $Id: ctsim.cpp,v 1.108 2002/05/05 08:09:34 kevin Exp $
+**  $Id: ctsim.cpp,v 1.109 2002/05/05 09:51:23 kevin Exp $
 **
 **  This program is free software; you can redistribute it and/or modify
 **  it under the terms of the GNU General Public License (version 2) as
@@ -70,7 +70,7 @@
 #endif
 #endif
 
-static const char* rcsindent = "$Id: ctsim.cpp,v 1.108 2002/05/05 08:09:34 kevin Exp $";
+static const char* rcsindent = "$Id: ctsim.cpp,v 1.109 2002/05/05 09:51:23 kevin Exp $";
 
 struct option CTSimApp::ctsimOptions[] = 
 {
@@ -201,8 +201,10 @@ CTSimApp::OnInit()
   if (! m_pFrame->getWinHelpController().Initialize(helpDir + "/ctsim"))
     *m_pLog << "Cannot initialize the Windows Help system" << "\n";
 #else
-  if (! m_pFrame->getHtmlHelpController().AddBook("/usr/share/ctsim/ctsim.htb") &&
-    ! m_pFrame->getHtmlHelpController().Initialize("/usr/local/share/ctsim/ctsim.htb"))
+  wxString docDir (DATADIR);
+  wxString docFile = docDir + "ctsim.htb";
+  if (! m_pFrame->getHtmlHelpController().AddBook(docFile) &&
+    ! m_pFrame->getHtmlHelpController().Initialize("/usr/share/ctsim/ctsim.htb"))
     *m_pLog << "Cannot initialize the HTML Help system" << "\n";
   else {
     if (::wxDirExists ("/tmp"))