Multiarch patch: install libraries to OMHOME/lib/<triplet>/omc

- This will allow users to install multiple versions of the simulation libraries at the same time git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@25841 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Apr 30, 2015 · 1e3d33b · 1e3d33b
1 parent 8a93f2f
commit 1e3d33b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/OMPlot/OMPlotGUI/Makefile.unix.in b/OMPlot/OMPlotGUI/Makefile.unix.in
@@ -34,8 +34,8 @@ endif
 
 $(LIB): Makefile.lib
 	$(MAKE) -f $<
-	cp -a ../bin/libOMPlot* $(top_builddir)/build/lib/omc/
-	test ! `uname` = Darwin || install_name_tool -id @rpath/libOMPlot.1.0.0.dylib $(top_builddir)/build/lib/omc/libOMPlot.1.0.0.dylib
+	cp -a ../bin/libOMPlot* $(top_builddir)/build/lib/@host_short@/omc/
+	test ! `uname` = Darwin || install_name_tool -id @rpath/libOMPlot.1.0.0.dylib $(top_builddir)/build/lib/@host_short@/omc/libOMPlot.1.0.0.dylib
 
 build: $(NAME) $(LIB)
 	cp -p ../bin/$(NAME) $(builddir_bin)

diff --git a/OMPlot/OMPlotGUI/OMPlotGUI.config.in b/OMPlot/OMPlotGUI/OMPlotGUI.config.in
@@ -2,7 +2,7 @@ QMAKE_CC  = @CC@
 QMAKE_CXX = @CXX@
 QMAKE_LINK = @CXX@
 
-LIBS += -L ../../build/lib/omc -lomqwt @RPATH_QMAKE@
+LIBS += -L ../../build/lib/@host_short@/omc -lomqwt @RPATH_QMAKE@
 INCLUDEPATH += ../../3rdParty/qwt/src ../../3rdParty/gc/include
 
 QMAKE_CFLAGS = @CFLAGS@ @CPPFLAGS@