More Makefile fixes for Win 64 build.

git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@7560 bbc10eb1-c90d-0410-af57-cb519fbb1720

prism/Makefile

@@ -332,6 +332,7 @@ extpackages: checks
 	  LIBPREFIX="$(LIBPREFIX)" \
 	  LIBSUFFIX="$(LIBSUFFIX)" \
 	  LIBMATH="$(LIBMATH)" \
+	  BINDISTSUFFIX="$(BINDISTSUFFIX)" \
 	  JAVA_DIR="$(JAVA_DIR)" \
 	  ) || exit 1; \
 	done

prism/ext/lp_solve_5.5_java/Makefile

@@ -16,7 +16,7 @@ checks:
 	fi; 
 
 lpsolve55java:
-	@echo Making sure lpsolve55 Java wrapper is compatible with $(OSTYPE) $(EARCH)
+	@echo Making sure lpsolve55 Java wrapper is compatible with $(OSTYPE) $(ARCH)
 	@(if [ "$(OSTYPE)" = "linux" ]; then \
 	  echo "Rebuild lpsolve55 Java wrapper for Linux"; \
 	  (cd lib ; ARCH=$(ARCH) JAVA_JNI_H_DIR="$(JAVA_JNI_H_DIR)" sh build); \
@@ -32,7 +32,11 @@ lpsolve55java:
 	  cp lib/lpsolve55j.jar lib/mac/liblpsolve55j.jnilib ../../lib/ ; \
 	fi)
 	@(if [ "$(OSTYPE)" = "cygwin" ]; then \
-	  cp lib/lpsolve55j.jar lib/win32/lpsolve55j.dll ../../lib/ ; \
+	  if [ "$(ARCH)" = "x86_64" ]; then \
+	    cp lib/lpsolve55j.jar lib/win64/lpsolve55j.dll ../../lib/ ; \
+	  else \
+	    cp lib/lpsolve55j.jar lib/win32/lpsolve55j.dll ../../lib/ ; \
+	  fi; \
 	fi)
 clean: checks
 	rm -f $(LPSOLVE55JAVA_DIR)/lib/lpsolve55j.jar

prism/ext/lpsolve55/Makefile

@@ -34,7 +34,7 @@ checks:
 
 ../../lib/$(LIBPREFIX)lpsolve55$(LIBSUFFIX):
 	@(if [ "$(OSTYPE)" = "cygwin" ]; then \
-	  cp bin/win32/$(LIBPREFIX)lpsolve55$(LIBSUFFIX) ../../lib; \
+	  cp bin/$(BINDISTSUFFIX)/$(LIBPREFIX)lpsolve55$(LIBSUFFIX) ../../lib; \
 	else \
 	  (cd src/lp_solve_5.5/lpsolve55 && \
 	  ARCH=$(ARCH) c=$(C) sh -x $(LPSOLVE55_BUILD) \