From 6751575bd07e61fcd42c2295a19c8a958ed8a856 Mon Sep 17 00:00:00 2001 From: Dave Parker Date: Fri, 28 Aug 2009 08:50:19 +0000 Subject: [PATCH] Moved nsis_script.nsi into src. git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@1437 bbc10eb1-c90d-0410-af57-cb519fbb1720 --- prism/Makefile | 4 +++- prism/{ => src}/nsis_script.nsi | 0 2 files changed, 3 insertions(+), 1 deletion(-) rename prism/{ => src}/nsis_script.nsi (100%) diff --git a/prism/Makefile b/prism/Makefile index 2afd67d9..82398ac6 100644 --- a/prism/Makefile +++ b/prism/Makefile @@ -102,6 +102,8 @@ endif #JAVA_DIR = /cygdrive/c/java/j2sdk1.4.2 #JAVA_DIR = /System/Library/Frameworks/JavaVM.framework +JAVA_DIR = /usr/lib/jvm/java-6-sun-1.6.0.14 + ################## # Compilers etc. # ################## @@ -374,7 +376,7 @@ dist_copy: dist_bin_copy: @if [ "$(BINDISTSUFFIX)" = "win" ]; then \ echo Building NSIS Windows installer... && \ - makensis /DPRISM_NAME="PRISM $(VERSION)" /DPRISM_BUILD="prism-$(VERSION)" /DPRISM_DIR="" nsis_script.nsi; \ + makensis /DPRISM_NAME="PRISM $(VERSION)" /DPRISM_BUILD="prism-$(VERSION)" /DPRISM_DIR="" src/nsis_script.nsi; \ else \ BIN_DIST_DIR=`/bin/pwd | sed 's/-src$$//'`"-$(BINDISTSUFFIX)" && \ BIN_DIST_DIR_NAME=`basename $$BIN_DIST_DIR` && \ diff --git a/prism/nsis_script.nsi b/prism/src/nsis_script.nsi similarity index 100% rename from prism/nsis_script.nsi rename to prism/src/nsis_script.nsi