Xtthelp, project xtthelp-files moved from to ./

src/exe/co_convert/src/cnv_readxtthelp.cpp

@@ -51,6 +51,7 @@ extern "C" {
 #include "co_dcli.h"
 }
 
+#include "pwr_names.h"
 #include "co_nav_help.h"
 #include "cnv_readxtthelp.h"
 #include "cnv_xtthelpto.h"
@@ -105,8 +106,8 @@ int CnvReadXtthelp::read_xtthelp()
 
   if ( xtthelpto->confpass()) {
     xtthelpto->set_confpass( true);
-    NavHelp *navhelp = new NavHelp( (void *)this, "$pwr_exe/wtt_help.dat",
-				  "$pwrp_exe/xtt_help.dat");
+    NavHelp *navhelp = new NavHelp( (void *)this, pwr_cNameBaseWttHelp,
+				    pwr_cNameProjectXttHelp);
     navhelp->insert_cb = help_insert_cb;
     navhelp->set_propagate(0);  			// Don't print include files
     
@@ -116,8 +117,8 @@ int CnvReadXtthelp::read_xtthelp()
     delete navhelp;
     xtthelpto->set_confpass( false);
   }
-  NavHelp *navhelp = new NavHelp( (void *)this, "$pwr_exe/wtt_help.dat",
-				  "$pwrp_exe/xtt_help.dat");
+  NavHelp *navhelp = new NavHelp( (void *)this, pwr_cNameBaseWttHelp,
+				  pwr_cNameProjectXttHelp);
   navhelp->insert_cb = help_insert_cb;
   navhelp->set_propagate(0);  			// Don't print include files
   sts = navhelp->help( NULL, "", navh_eHelpFile_Other, 

src/exp/inc/src/pwr_names.h

@@ -67,8 +67,8 @@
 # define        pwr_cNameCustomBuild   "$pwrp_exe/custom_build.sh"
 # define        pwr_cNameBaseXttHelp   "$pwr_lang/xtt_help.dat"
 # define        pwr_cNameBaseWttHelp   "$pwr_lang/wtt_help.dat"
-# define        pwr_cNameProjectXttHelp "$pwrp_exe/xtt_help.dat"
-# define        pwr_cNamePlcXttHelp    "$pwrp_exe/xtthelp_%s_plc.dat"
+# define        pwr_cNameProjectXttHelp "$pwrp_load/xtt_help.dat"
+# define        pwr_cNamePlcXttHelp    "$pwrp_load/xtthelp_%s_plc.dat"
 
 #elif defined OS_VMS || defined OS_ELN
 

wb/lib/wb/src/wb_build.cpp

@@ -232,7 +232,7 @@ void wb_build::node( char *nodename, void *volumelist, int volumecnt)
     pwr_tTime	dest_time, src_time;
 
 
-    // Copy xtt_help.dat from $pwrp_cnf to $pwrp_exe
+    // Copy xtt_help.dat from $pwrp_cnf to $pwrp_load
     sprintf( src_fname, "$pwrp_cnf/%s/xtt_help.dat", node);
     dcli_translate_filename( src_fname, src_fname);
     m_sts = dcli_file_time( src_fname, &src_time);
@@ -248,7 +248,7 @@ void wb_build::node( char *nodename, void *volumelist, int volumecnt)
     }
 
     if ( oddSts()) {
-      strcpy( dest_fname, "$pwrp_exe/xtt_help.dat");
+      strcpy( dest_fname, "$pwrp_load/xtt_help.dat");
       dcli_translate_filename( dest_fname, dest_fname);
       m_sts = dcli_file_time( dest_fname, &dest_time);
       if ( opt.force || evenSts() || src_time.tv_sec > dest_time.tv_sec) {

wb/lib/wb/src/wb_lfu.cpp

@@ -2282,7 +2282,7 @@ pwr_tStatus lfu_SaveDirectoryVolume(
 	      if ( *components_ptr & pwr_mDistrComponentMask_XMLFiles)
 		fprintf( file, "appl %s W $pwrp_load/*.xml\n", nodename_ptr);
 	      if ( *components_ptr & pwr_mDistrComponentMask_XttHelpFile)
-		fprintf( file, "appl %s W $pwrp_cnf/%s/xtt_help.dat:$pwrp_cnf/xtt_help.dat $pwrp_exe/xtt_help.dat\n", 
+		fprintf( file, "appl %s W $pwrp_cnf/%s/xtt_help.dat:$pwrp_cnf/xtt_help.dat $pwrp_load/xtt_help.dat\n", 
 			 nodename_ptr, nodename_ptr);
 	      if ( *components_ptr & pwr_mDistrComponentMask_XttResourceFile)
 		fprintf( file, "appl %s W $pwrp_cnf/%s/b55/Rt_xtt:$pwrp_cnf/%s/Rt_xtt:$pwrp_cnf/Rt_xtt /home/b55/Rt_xtt\n", 

xtt/lib/ge/src/ge_graph_web.cpp

@@ -587,7 +587,7 @@ int Graph::generate_web_help()
   // Copy default css-file to pwrp_web
   system( "cp $pwr_exe/pwr_css.css $pwrp_web/");
 
-  // If $pwrp_exe/xtt_help.dat exist convert this to html
+  // If $pwrp_load/xtt_help.dat exist convert this to html
   sts = dcli_search_file( pwr_cNameProjectXttHelp, fname,
 			  DCLI_DIR_SEARCH_INIT);
   if ( ODD(sts)) {