- Fix OMNotebook search path for OMNotebookHelp.onb (search in $OPENM…

…ODELICAHOME/share/omnotebook/ instead of $OPENMODELICA/bin/) git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@6359 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Oct 13, 2010 · f4ea452 · f4ea452
1 parent 1556b95
commit f4ea452
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/OMNotebook/OMNotebookQT4/Makefile.unix.in b/OMNotebook/OMNotebookQT4/Makefile.unix.in
@@ -38,6 +38,7 @@ build: $(NAME)
 	mkdir -p $$DIRS) && \
 	cd ../DrModelica/ && \
 	find . -name \*.onb -exec cp {} $(builddir_share)/omnotebook/drmodelica/{} \;)
+	mv $(builddir_share)/omnotebook/drmodelica/OMNotebookHelp.onb $(builddir_share)/omnotebook/
 
 Makefile.unix: Makefile.unix.in
 	cd $(top_builddir); ./config.status

diff --git a/OMNotebook/OMNotebookQT4/notebook.cpp b/OMNotebook/OMNotebookQT4/notebook.cpp
@@ -2661,10 +2661,9 @@ namespace IAEX
 			if( help.isEmpty() )
 				QMessageBox::critical( 0, "OpenModelica Error", "Could not find environment variable OPENMODELICAHOME; OMNotebook will therefore not work correctly" );
 
-			if( help.endsWith("/") || help.endsWith( "\\") )
-				help += "bin/";
-			else
-				help += "/bin/";
+			if( !help.endsWith("/") && !help.endsWith( "\\") )
+				help += "/";
+      help += "share/omnotebook/";
 
 			QString helpFile = "OMNotebookHelp.onb";
 			dir.setPath( help );