From cd295537fcf615bec57f037bf06bba0a73fe85e0 Mon Sep 17 00:00:00 2001 From: Thomas Vander Stichele Date: Sun, 25 Nov 2012 18:21:11 +0000 Subject: [PATCH] * configure.ac: * morituri/configure/installed.py.in: * morituri/configure/uninstalled.py.in: Create configure.configure.pluginsdir --- ChangeLog | 7 +++++++ configure.ac | 3 +++ morituri/configure/installed.py.in | 1 + morituri/configure/uninstalled.py.in | 6 ++++++ 4 files changed, 17 insertions(+) diff --git a/ChangeLog b/ChangeLog index 0bb5ed5..be6f6c0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2012-11-25 Thomas Vander Stichele + + * configure.ac: + * morituri/configure/installed.py.in: + * morituri/configure/uninstalled.py.in: + Create configure.configure.pluginsdir + 2012-11-23 Thomas Vander Stichele * configure.ac: diff --git a/configure.ac b/configure.ac index cf912f4..0e2d688 100644 --- a/configure.ac +++ b/configure.ac @@ -35,6 +35,9 @@ AS_AC_EXPAND(PYTHONLIBDIR, "\${exec_prefix}/lib/python$PYVER/site-packages") AC_MSG_NOTICE(Installing python code in $PYTHONLIBDIR) AC_SUBST(PYTHONLIBDIR) +AS_AC_EXPAND(PLUGINSDIR, "\${libdir}/morituri/plugins") +AC_MSG_NOTICE(Setting plugins directory to $PLUGINSDIR) + dnl check for epydoc AC_CHECK_PROG(EPYDOC, epydoc, yes, no) AM_CONDITIONAL(HAVE_EPYDOC, test "x$EPYDOC" = "xyes") diff --git a/morituri/configure/installed.py.in b/morituri/configure/installed.py.in index 8a78ae0..c2c536a 100644 --- a/morituri/configure/installed.py.in +++ b/morituri/configure/installed.py.in @@ -5,5 +5,6 @@ def get(): return { 'isinstalled': True, + 'pluginsdir': '@PLUGINSDIR@', 'version': '@VERSION@', } diff --git a/morituri/configure/uninstalled.py.in b/morituri/configure/uninstalled.py.in index 4078f80..721e1a3 100644 --- a/morituri/configure/uninstalled.py.in +++ b/morituri/configure/uninstalled.py.in @@ -1,9 +1,15 @@ # -*- Mode: Python -*- # vi:si:et:sw=4:sts=4:ts=4 +import os + + +__thisdir = os.path.dirname(os.path.abspath(__file__)) def get(): return { 'isinstalled': False, + 'pluginsdir': os.path.abspath(os.path.join( + __thisdir, '..', '..', 'plugins')), 'version': '@VERSION@', }