From 48c9626aed8af35a58ee619f55aec6e727681d26 Mon Sep 17 00:00:00 2001 From: Michael Elkins Date: Thu, 4 Apr 2013 17:34:54 +0000 Subject: set PYTHONPATH from rpki.autoconf.datarootdir at runtime rather than substituting at build time svn path=/trunk/; revision=5276 --- rpkid/Makefile.in | 3 +-- rpkid/portal-gui/rpki.wsgi.in | 4 +++- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'rpkid') diff --git a/rpkid/Makefile.in b/rpkid/Makefile.in index dd0c5eb4..763c8ba8 100644 --- a/rpkid/Makefile.in +++ b/rpkid/Makefile.in @@ -261,8 +261,7 @@ portal-gui/scripts/rpkigui-check-expired: portal-gui/scripts/rpkigui-check-expir ${COMPILE_PYTHON} portal-gui/rpki.wsgi: ${srcdir}/portal-gui/rpki.wsgi.in - sed -e "s|@PYTHON""PATH@|${sysconfdir}/rpki|" \ - ${srcdir}/portal-gui/rpki.wsgi.in > portal-gui/rpki.wsgi + cp $? $@ portal-gui/scripts/rpki-manage: ${srcdir}/portal-gui/scripts/rpki-manage.in sed -e "s|@DJANGO""_ADMIN@|${DJANGO_ADMIN}|" \ diff --git a/rpkid/portal-gui/rpki.wsgi.in b/rpkid/portal-gui/rpki.wsgi.in index 8fedf93e..37bed594 100644 --- a/rpkid/portal-gui/rpki.wsgi.in +++ b/rpkid/portal-gui/rpki.wsgi.in @@ -19,9 +19,11 @@ __version__ = '$Id$' import sys import os +import rpki.autoconf os.environ['DJANGO_SETTINGS_MODULE'] = 'rpki.gui.default_settings' -sys.path.insert(1, '@PYTHONPATH@') +# needed for local_settings.py +sys.path.insert(1, rpki.autoconf.sysconfdir + '/rpki') import django.core.handlers.wsgi application = django.core.handlers.wsgi.WSGIHandler() -- cgit v1.2.3