diff options
| author | Michael Elkins <melkins@tislabs.com> | 2013-04-04 17:34:54 +0000 |
|---|---|---|
| committer | Michael Elkins <melkins@tislabs.com> | 2013-04-04 17:34:54 +0000 |
| commit | 48c9626aed8af35a58ee619f55aec6e727681d26 (patch) | |
| tree | 2d221a3bb8022057bd1223c4d5ed414071c765ee | |
| parent | debe36911825690df0ea999630ef7fd54a69990a (diff) | |
set PYTHONPATH from rpki.autoconf.datarootdir at runtime rather than substituting at build time
svn path=/trunk/; revision=5276
| -rw-r--r-- | rpkid/Makefile.in | 3 | ||||
| -rw-r--r-- | rpkid/portal-gui/rpki.wsgi.in | 4 |
2 files changed, 4 insertions, 3 deletions
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() |