Use the prefix for OPENMODELICAHOME

OpenModelica · Aug 6, 2015 · 0777ed5 · 0777ed5
1 parent dfda18a
commit 0777ed5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/OMShell/OMShellGUI/omc_config.h.in b/OMShell/OMShellGUI/omc_config.h.in
@@ -1 +1 @@
-#define CONFIG_DEFAULT_OPENMODELICAHOME "@OPENMODELICAHOME@"
+#define CONFIG_DEFAULT_OPENMODELICAHOME "@prefix@"
diff --git a/OMShell/OMShellGUI/omcinteractiveenvironment.cpp b/OMShell/OMShellGUI/omcinteractiveenvironment.cpp
@@ -130,7 +130,11 @@ namespace IAEX
 #ifdef WIN32
       omc = QString( omhome ) + "/bin/omc.exe";
 #else /* unix */
-      omc = (omhome ? QString(omhome)+"/bin/omc" : QString(CONFIG_DEFAULT_OPENMODELICAHOME) + "/bin/omc");
+      omc = (omhome ? QString(omhome)+"/bin/omc" : QString(CONFIG_DEFAULT_OPENMODELICAHOME "/bin/omc"));
+      QFileInfo checkFile(omc);
+      if (!checkFile.exists() || !checkFile.isFile()) {
+        omc = "omc";
+      }
 #endif
 
       QStringList parameters;