From cee8e0b6b7a231efb30b1915dc91d11e7103ffa4 Mon Sep 17 00:00:00 2001 From: Dave Parker Date: Fri, 21 Dec 2012 20:10:21 +0000 Subject: [PATCH] Remove pushd/popd from Makefile (crashed on Ubuntu). git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@6269 bbc10eb1-c90d-0410-af57-cb519fbb1720 --- prism/ext/lp_solve_5.5_java/Makefile | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/prism/ext/lp_solve_5.5_java/Makefile b/prism/ext/lp_solve_5.5_java/Makefile index 729f4ebc..e2738a46 100644 --- a/prism/ext/lp_solve_5.5_java/Makefile +++ b/prism/ext/lp_solve_5.5_java/Makefile @@ -19,9 +19,7 @@ lpsolve55java: @echo Making sure lpsolve55 Java wrapper is compatible with $(OSTYPE) $(EARCH) @(if [ "$(OSTYPE)" = "linux" ]; then \ echo "Rebuild lpsolve55 Java wrapper for Linux"; \ - pushd lib/ ; \ - ARCH=$(ARCH) JAVA_JNI_H_DIR="$(JAVA_JNI_H_DIR)" sh build; \ - popd; \ + (cd lib ; ARCH=$(ARCH) JAVA_JNI_H_DIR="$(JAVA_JNI_H_DIR)" sh build); \ if [ "$(ARCH)" = "" ]; then \ cp lib/lpsolve55j.jar lib/ux32/liblpsolve55j.so ../../lib/ ; \ else \ @@ -30,9 +28,7 @@ lpsolve55java: fi) @(if [ "$(OSTYPE)" = "darwin" ]; then \ echo "Rebuild lpsolve55 Java wrapper for MacOS"; \ - pushd lib/mac/ ; \ - ARCH=$(ARCH) sh -x build-osx; \ - popd; \ + (cd lib/mac; ARCH=$(ARCH) sh -x build-osx); \ cp lib/lpsolve55j.jar lib/mac/liblpsolve55j.jnilib ../../lib/ ; \ fi) @(if [ "$(OSTYPE)" = "cygwin" ]; then \