Merge branch 'da/maint-python-startup'
* da/maint-python-startup:
Makefile: Remove usage of deprecated Python "has_key" method
diff --git a/Makefile b/Makefile
index 9d850f4..956e781 100644
--- a/Makefile
+++ b/Makefile
@@ -1612,9 +1612,8 @@
-e '}' \
-e 's|^import sys.*|&; \\\
import os; \\\
- sys.path[0] = os.environ.has_key("GITPYTHONLIB") and \\\
- os.environ["GITPYTHONLIB"] or \\\
- "@@INSTLIBDIR@@"|' \
+ sys.path.insert(0, os.getenv("GITPYTHONLIB",\
+ "@@INSTLIBDIR@@"));|' \
-e 's|@@INSTLIBDIR@@|'"$$INSTLIBDIR"'|g' \
$@.py >$@+ && \
chmod +x $@+ && \
