Merge branch 'hotfix-1.5.3'

Author: logan-nc

docs/conf.py

@@ -62,7 +62,7 @@
 # The short X.Y version.
 version = '1.5'
 # The full version, including alpha/beta/rc tags.
-release = '1.5.2'
+release = '1.5.3'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

docs/releases.rst

@@ -10,6 +10,14 @@ Note, backwards compatibility is defined as the ability to return to a previous
 
 The `github release notes <https://github.com/PrincetonUniversity/GPEC/releases>`_ are reproduced below.
 
+GPEC v1.5.3
+===========
+
+Fixes
+------
+- INSTALL - Respects user's env when choosing NETCDFINC
+
+
 GPEC v1.5.2
 ===========
 

install/DEFAULTS.inc

@@ -252,10 +252,12 @@ ifdef NETCDF_FORTRAN_HOME
     else
         NETCDFDIR = $(NETCDF_FORTRAN_HOME)
     endif
-    ifneq ($(wildcard $(NETCDF_FORTRAN_HOME)/include/.),)
-        NETCDFINC = $(NETCDF_FORTRAN_HOME)/include
-    else
-        NETCDFINC = $(NETCDF_FORTRAN_HOME)
+    ifndef NETCDFINC
+        ifneq ($(wildcard $(NETCDF_FORTRAN_HOME)/include/.),)
+            NETCDFINC = $(NETCDF_FORTRAN_HOME)/include
+        else
+            NETCDFINC = $(NETCDF_FORTRAN_HOME)
+        endif
     endif
 else
     ifndef NETCDFHOME
@@ -270,10 +272,12 @@ else
     else
         NETCDFDIR = $(NETCDFHOME)
     endif
-    ifneq ($(wildcard $(NETCDFHOME)/include/.),)
-        NETCDFINC = $(NETCDFHOME)/include
-    else
-        NETCDFINC = $(NETCDFHOME)
+    ifndef NETCDFINC
+        ifneq ($(wildcard $(NETCDFHOME)/include/.),)
+            NETCDFINC = $(NETCDFHOME)/include
+        else
+            NETCDFINC = $(NETCDFHOME)
+        endif
     endif
 endif
 # check if the netcdf and netcdf libraries are split up or not