--- install.py.orig	2019-05-04 05:26:43.000000000 -0400
+++ install.py	2019-05-12 15:14:07.000000000 -0400
@@ -828,7 +828,7 @@
     # set install prefix, if not None
     if distDir:
         for key in list(cfg.keys()):
-            cfg[key] = os.path.normpath(os.path.join(distDir, cfg[key]))
+            cfg[key] = os.path.normpath(distDir + os.sep + cfg[key])
     
     try:
         # Install the files
@@ -1190,11 +1190,13 @@
     os.makedirs(dirs["exe"])
     os.makedirs(dirs["icns"])
     
-    if macPythonExe == defaultMacPythonExe:
-        starter = os.path.join(dirs["exe"], "eric")
-        os.symlink(macPythonExe, starter)
-    else:
-        starter = "python{0}".format(sys.version_info.major)
+##    if macPythonExe == defaultMacPythonExe:
+##        starter = os.path.join(dirs["exe"], "eric")
+##        os.symlink(macPythonExe, starter)
+##    else:
+##        starter = "python{0}".format(sys.version_info.major)
+    starter = "@@PYTHON_BIN_NAME@@"
+
     
     wname = os.path.join(dirs["exe"], "eric6")
     
@@ -1223,13 +1225,15 @@
                 pathlist_n.append(path_)
         pathLine = "PATH={0}\n".format(os.pathsep.join(pathlist_n))
     
+    pydir = "@@PYTHON_PKG_DIR@@"
+    pyqt_ver = "@@PYQT_VERSION@@"
     # create the wrapper script
     wrapper = ('''#!/bin/sh\n'''
                '''\n'''
                '''{0}'''
                '''{1}'''
-               '''exec "{2}" "{3}/{4}.py" "$@"\n'''
-               .format(pathLine, dyldLine, starter, pydir, "eric6"))
+               '''exec "{2}" "{3}/{4}.py" "{5}" "$@"\n'''
+               .format(pathLine, dyldLine, starter, pydir, "eric6", pyqt_ver))
     copyToFile(wname, wrapper)
     os.chmod(wname, 0o755)
     
