From 8e1c5ec0d52e2ebd957e6a479a4e7a6cc3d5aa23 Mon Sep 17 00:00:00 2001 From: Dave Parker Date: Tue, 7 Nov 2006 14:31:59 +0000 Subject: [PATCH] Bugfixes for new script file generation stuff (on Cygwin). git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@127 bbc10eb1-c90d-0410-af57-cb519fbb1720 --- prism/Makefile | 8 ++++---- prism/src/bin/prism.cygwin | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/prism/Makefile b/prism/Makefile index 41f56be6..95c7f0ff 100644 --- a/prism/Makefile +++ b/prism/Makefile @@ -215,10 +215,10 @@ ifeq ($(OSTYPE),cygwin) BIN_PRISM_SRC=src/bin/prism.cygwin BIN_XPRISM=bin/xprism BIN_XPRISM_SRC=src/bin/xprism.linux - BIN_PRISM=bin/prism.bat - BIN_PRISM_SRC=src/bin/prism.bat - BIN_XPRISM=bin/xprism.bat - BIN_XPRISM_SRC=src/bin/xprism.bat + BIN_PRISM_BAT=bin/prism.bat + BIN_PRISM_BAT_SRC=src/bin/prism.bat + BIN_XPRISM_BAT=bin/xprism.bat + BIN_XPRISM_BAT_SRC=src/bin/xprism.bat BIN_TARGETS=$(BIN_PRISM) $(BIN_XPRISM) $(BIN_PRISM_BAT) $(BIN_XPRISM_BAT) endif ifeq ($(OSTYPE),darwin) diff --git a/prism/src/bin/prism.cygwin b/prism/src/bin/prism.cygwin index 51f8b968..a04c0612 100644 --- a/prism/src/bin/prism.cygwin +++ b/prism/src/bin/prism.cygwin @@ -19,18 +19,18 @@ if [ "$PRISM_JAVAMAXMEM" != "" ]; then PRISM_JAVAMAXMEM="-Xmx$PRISM_JAVAMAXMEM" fi -# Add PRISM to LD_LIBRARY_PATH -if [ "$LD_LIBRARY_PATH" = "" ]; then - LD_LIBRARY_PATH="$PRISM_DIR"/lib +# Add PRISM to PATH +if [ "$PATH" = "" ]; then + PATH="$PRISM_DIR"/lib else - LD_LIBRARY_PATH="$PRISM_DIR"/lib:$LD_LIBRARY_PATH + PATH="$PRISM_DIR"/lib:$PATH fi # Set up classpath - jar file (for binary versions) gets priority PRISM_CLASSPATH="$PRISM_DIR"/lib/prism.jar:"$PRISM_DIR"/classes:"$PRISM_DIR"/lib/pepa.zip # Export environment variables -export PRISM_DIR LD_LIBRARY_PATH +export PRISM_DIR PATH # Main Java class to launch if [ "$PRISM_MAINCLASS" = "" ]; then