From 76ca80dcd5cff1364ab25deb1349930581d59a53 Mon Sep 17 00:00:00 2001 From: Jonas Thiem Date: Sat, 7 Feb 2015 22:37:40 +0100 Subject: [PATCH] Moving over PYTHON_SITEPACKAGES definition from makepanda.py to installpanda.py --- makepanda/installpanda.py | 5 +++++ makepanda/makepanda.py | 4 ---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/makepanda/installpanda.py b/makepanda/installpanda.py index c35ad8abd3..b1804942d8 100644 --- a/makepanda/installpanda.py +++ b/makepanda/installpanda.py @@ -17,6 +17,11 @@ from distutils.sysconfig import get_python_lib from optparse import OptionParser from makepandacore import * +def python_sitepackages_path(): + from distutils.sysconfig import get_python_lib + return get_python_lib(1) +PYTHON_SITEPACKAGES=python_sitepackages_path() + MIME_INFO = ( ("egg", "model/x-egg", "EGG model file", "pview"), ("bam", "model/x-bam", "Panda3D binary model file", "pview"), diff --git a/makepanda/makepanda.py b/makepanda/makepanda.py index f80f8519ae..e3ceecb3b0 100755 --- a/makepanda/makepanda.py +++ b/makepanda/makepanda.py @@ -6184,10 +6184,6 @@ Description: Runtime binary and browser plugin for the Panda3D Game Engine """ -def python_sitepackages_path(): - from distutils.sysconfig import get_python_lib - return get_python_lib(1) -PYTHON_SITEPACKAGES=python_sitepackages_path() # We're not putting "python" in the "Requires" field, # since the rpm-based distros don't have a common