[pyferret] 77/110: Update site_specific.mk

[Alastair McKinstry]

This is an automated email from the git hooks/post-receive script.

mckinstry pushed a commit to branch debian/master
in repository pyferret.

commit 3d593ac91ca3105e3fca082c223ef061720f03c2
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Sun Aug 14 08:57:12 2016 +0100

    Update site_specific.mk
---
 debian/site_specific.mk.in | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/debian/site_specific.mk.in b/debian/site_specific.mk.in
index bf1b407..0d24375 100644
--- a/debian/site_specific.mk.in
+++ b/debian/site_specific.mk.in
@@ -24,14 +24,6 @@ PYTHONINCDIR   := /usr/include/$(PYTHON_EXE)
 ## files just for creating a Ferret installation.
 INSTALL_FER_DIR	= $(FER_DIR)
 
-## Java home directory - this may be predefined
-## from your shell environment.  If JAVA_HOME is defined,
-## $(JAVA_HOME)/bin/javac and $(JAVA_HOME)/bin/jar is
-## called to build threddsBrowser.jar; otherwise, it just
-## uses javac and jar (from the path).
-
-# PyFerret version number - do not change this
-PYFERRET_VERSION = 1.2.0
 
 ## Installation directory for built Ferret.  Using the "install"
 ## Makefile target circumvents the need to create the fer_*.tar.gz
@@ -59,3 +51,12 @@ FER_LOCAL_EXTFCNS = $(INSTALL_FER_DIR)/usr/lib/ferret-vis/external_functions
 ## used by Qt4 must be used.
 # CAIRO_DIR	=
 #CAIRO_DIR	= @LIBDIR@
+
+## Java home directory - this may be predefined
+## from your shell environment.  If JAVA_HOME is defined,
+## $(JAVA_HOME)/bin/javac and $(JAVA_HOME)/bin/jar is
+## called to build threddsBrowser.jar; otherwise,
+## threddsBrowser.jar is not built and the Ferret command
+## SET DATA /BROWSE (or the alias OPEN) will not work.
+# JAVA_HOME = /usr/java/default
+JAVA_HOME       =  /usr/lib/jvm/default-java

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/pyferret.git