- Fix priority MSL 3.1 > MSL 3.2

- Don't always copy omlibrary (test -d instead of -f)


git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@9089 f25d12d1-65f4-0310-ae8a-bbce733d8d8e

Compiler/runtime/systemimpl.c

@@ -1470,6 +1470,7 @@ int SystemImpl__getLoadModelPath(const char *name, void *prios, void *mps, const
             /* Search for an appropriate version of the library */
             outPrio = prio;
             prio = getPrio(version,versionLen);
+            if (prio == 0 && 0 == strcmp("Modelica",name) && 0 == strcmp(version,"3.1")) prio = -1;
             /* TODO: Use something better than strcmp. We need natural sort for all cases... */
             if (prio < defaultPrio || (prio == defaultPrio && strcmp(version, defaultVersion) > 0)) {
               defaultPrio = prio;

Makefile.common

@@ -103,7 +103,7 @@ susgen:
 	(cd Compiler/susan_codegen/SimCode/GenTest && time $(MAKE) -f Makefile)
 
 omlibrary:
-	test ! -f ../build/lib/omlibrary && \
+	test ! -d ../build/lib/omlibrary && \
 	(cd libraries/ && find . -type d -not -path "*svn*" -exec install -m755 -d ../build/lib/omlibrary/{} \;) && \
 	(cd libraries/ && find . -type f -not -path "*svn*" -exec install -m644 {} ../build/lib/omlibrary/{} \;)