- OSX compilation. Works with the NewTables package

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@15792 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Apr 11, 2013 · c5d0cdc · c5d0cdc
1 parent e36a585
commit c5d0cdc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/SimulationRuntime/c/ModelicaExternalC/Makefile.common b/SimulationRuntime/c/ModelicaExternalC/Makefile.common
@@ -15,7 +15,7 @@ all: libModelicaExternalC.a ModelicaTables
 ModelicaTables : $(TABLEBUILDDIR)/Makefile
 	$(MAKE) -C $(TABLEBUILDDIR)
 $(TABLEBUILDDIR)/Makefile : $(TABLEBUILDDIR)/configure $(REGEN)
-	cd $(TABLEBUILDDIR) && ./configure CC="$(CC)" CFLAGS="$(CFLAGS)" CPPFLAGS="-Wno-unused-result $(CPPFLAGS)"
+	cd $(TABLEBUILDDIR) && ./configure $(PREFIX) CC="$(CC)" CFLAGS="$(CFLAGS)" CPPFLAGS="-Wno-unused-result $(CPPFLAGS)"
 	make -C $(TABLEBUILDDIR) clean
 $(TABLEBUILDDIR)/configure : $(TABLEBUILDDIR)/autogen.sh
 	cd $(TABLEBUILDDIR) && ./autogen.sh

diff --git a/SimulationRuntime/c/ModelicaExternalC/Makefile.in b/SimulationRuntime/c/ModelicaExternalC/Makefile.in
@@ -9,7 +9,8 @@ CXX = @CXX@
 CFLAGS = @CFLAGS@ -I../util
 CPPFLAGS = @CPPFLAGS@ -I.. -Dlinux
 REGEN = Makefile.in
-MODELICATABLES = libModelicaTables@SHREXT@*
+MODELICATABLES = libModelicaTables*@SHREXT@*
+PREFIX = --prefix="@prefix@" --libdir='$${exec_prefix}/lib/omc'
 
 include Makefile.common