Index: wflow-py/mkversion.py
===================================================================
diff -u -r412ef230eb57e0be0f5393b3f2fe8efca74d9d4f -r405114bf53fffa2637a5383483a1fb99fbc73f39
--- wflow-py/mkversion.py	(.../mkversion.py)	(revision 412ef230eb57e0be0f5393b3f2fe8efca74d9d4f)
+++ wflow-py/mkversion.py	(.../mkversion.py)	(revision 405114bf53fffa2637a5383483a1fb99fbc73f39)
@@ -1,55 +1,61 @@
 import os
 import datetime
-
 import subprocess
 
 branch = None
 
 try:
-    branch = subprocess.check_output('git rev-parse --abbrev-ref HEAD', shell=True).strip()
+    branch = subprocess.check_output(
+        'git rev-parse --abbrev-ref HEAD', shell=True).strip()
 except:
     branch = None
 
 if branch == None:
     branch = 'master'
 
-vers='1'
+vers = '1'
 nrversion = '1.0'
 
 ###################################
 manualversion = nrversion + "." + branch + "." + vers
 manualmainversion = nrversion + "." + branch
 version = nrversion = '1.0' + "." + vers
 ###################################
-a = open("_version.py","w")
+a = open("_version.py", "w")
 
-build=datetime.datetime.now()
+build = datetime.datetime.now()
 
-a.write("# This file is made by mkversion.py, do not edit!")
-a.write("VERSION=\"" + manualversion +  "\"\n")
-a.write("MVERSION=\"" + manualmainversion +"\"\n")
-a.write("NVERSION=\"" + version +"\"\n")
-a.write("BUILD=\"" + str(build) +"\"\n")
+a.write("# This file is made by mkversion.py, do not edit!\n")
+a.write("VERSION='" + manualversion + "'\n")
+a.write("MVERSION='" + manualmainversion + "'\n")
+a.write("NVERSION='" + version + "'\n")
+a.write("BUILD='" + str(build) + "'\n")
 a.close()
 
-a = open("wflow/__init__.py","w")
-a.write("__all__ = [\"wflow_funcs\",\"wflow_adapt\",\"wflow_lib\",\"pcrut\",\"wf_DynamicFramework\",\"stats\"]\n")
-a.write("__version__=\"" + manualmainversion + "\"\n")
-a.write("__release__=\"" + manualversion + "\"\n")
-a.write("__versionnr__=\"" + version + "\"\n")
-a.write("__build__=\"" + str(build) + "\"\n")
-a.write("import osgeo.gdal as gdal\n\n")
+a = open("wflow/__init__.py", "w")
+a.write(
+    "__all__ = ['wflow_funcs','wflow_adapt','wflow_lib','pcrut','wf_DynamicFramework','stats']\n")
+a.write("__version__='" + manualmainversion + "'\n")
+a.write("__release__='" + manualversion + "'\n")
+a.write("__versionnr__='" + version + "'\n")
+a.write("__build__='" + str(build) + "'\n\n")
 a.write("import os, sys\n")
-a.write("if hasattr(sys, \"frozen\"):\n")
-a.write("    _ROOT = os.path.abspath(os.path.dirname(__file__)).split(\"library.zip\")[0]\n")
-a.write("    os.environ['GDAL_DATA'] = os.path.join(_ROOT,'gdal-data')\n")
-a.write("else:\n")
-a.write("    _ROOT = os.path.abspath(os.path.dirname(__file__))\n\n")
+a.write("import osgeo.gdal as gdal\n\n")
+a.write("if getattr(sys, 'frozen', False):\n")
+a.write("    # running in a bundle\n")
+a.write("    # sys._MEIPASS is set by PyInstaller\n")
+a.write("    basedir = getattr(sys, '_MEIPASS', None)\n")
+a.write("    # support also other bundlers\n")
+a.write("    if not basedir:\n")
+a.write("        basedir = os.path.dirname(sys.executable)\n\n")
+a.write("    # use the included gdal-data\n")
+a.write("    gdal_data_path = os.path.join(basedir, 'gdal-data')\n")
+a.write("    gdal.SetConfigOption('GDAL_DATA', gdal_data_path)\n\n")
+a.write("    # set environment variable instead of pyproj_datadir such\n")
+a.write("    # that child processes will inherit it\n")
+a.write("    os.environ['PROJ_DIR'] = os.path.join(basedir, 'proj-data')\n")
 
-a.write("def get_data(path):\n")
-a.write("    return os.path.join(_ROOT, 'data', path)\n")
 
-
 print "============================================================================="
 print "Now install wflow using setup.py install and regenerate the documentation...."
 print "============================================================================="