fix Linux builds, fix make install, test make install (#7002)

OpenModelica · Dec 2, 2020 · b1f7c4e · b1f7c4e
1 parent 11e397d
commit b1f7c4e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/.CI/common.groovy b/.CI/common.groovy
@@ -240,10 +240,12 @@ void buildOMC(CC, CXX, extraFlags, buildCpp) {
   sh 'autoconf'
   // Note: Do not use -march=native since we might use an incompatible machine in later stages
   def withCppRuntime = buildCpp ? "--with-cppruntime":"--without-cppruntime"
-  sh "./configure CC='${CC}' CXX='${CXX}' FC=gfortran CFLAGS=-Os ${withCppRuntime} --without-omc --without-omlibrary --with-omniORB --enable-modelica3d ${extraFlags}"
+  sh "./configure CC='${CC}' CXX='${CXX}' FC=gfortran CFLAGS=-Os ${withCppRuntime} --without-omc --without-omlibrary --with-omniORB --enable-modelica3d --prefix=`pwd`/install ${extraFlags}"
   // OMSimulator requires HOME to be set and writeable
   def outputSync = sh(script: "${makeCommand()} --version | grep -o -E '[0-9]+' | head -1 | sed -e 's/^0\\+//'", returnStdout: true).toInteger() >= 4 ? "--output-sync=recurse" : ""
   sh "HOME='${env.WORKSPACE}' ${makeCommand()} -j${numPhysicalCPU()} ${outputSync} omc omc-diff omsimulator"
+  // test make install
+  sh "HOME='${env.WORKSPACE}' ${makeCommand()} -j${numPhysicalCPU()} ${outputSync} install"
   sh 'find build/lib/*/omc/ -name "*.so" -exec strip {} ";"'
   // Run sanity tests
   sh '''

diff --git a/Makefile.in b/Makefile.in
@@ -178,7 +178,7 @@ install: install-dirs
 	# Java
 	cp -p "@OMBUILDDIR@"/share/omc/java/* ${INSTALL_JAVADIR}
 	# Translations
-	cp -rp "@OMBUILDDIR@"/share/locale/* ${INSTALL_LOCALEDIR}/
+	# cp -rp "@OMBUILDDIR@"/share/locale/* ${INSTALL_LOCALEDIR}/
 
 Makefile: Makefile.in config.status
 	./config.status