diff --git a/lodel/Makefile.am b/lodel/Makefile.am index a64a081..40ad02e 100644 --- a/lodel/Makefile.am +++ b/lodel/Makefile.am @@ -17,6 +17,7 @@ logdir = $(localstatedir)/log/lodel2/ do_subst = sed -e 's,\[@\]LODEL2_VARDIR\[@\],$(localstatedir)/lodel2/,g' \ -e 's,\[@\]LODEL2_LOGDIR\[@\],$(logdir),g' \ + -e 's,\[@\]LODEL2_LODEL_PKG\[@\],$(lodeldir),g' \ -e 's,\[@\]MULTISITE_DATA_DIRNAME\[@\],$(lodel2_multisite_data_dirname),g' \ -e 's,\[@\]MULTISITE_CTX_DIRNAME\[@\],$(lodel2_multisite_ctx_dirname),g' diff --git a/lodel/buildconf.py.am.in b/lodel/buildconf.py.am.in index 8a17957..92936ae 100644 --- a/lodel/buildconf.py.am.in +++ b/lodel/buildconf.py.am.in @@ -7,11 +7,11 @@ WEBUI=@WEBUI@ #Populated by make LODEL2VARDIR="[@]LODEL2_VARDIR[@]" LODEL2LOGDIR="[@]LODEL2_LOGDIR[@]" +LODEL_PKG_PATH = "[@]LODEL2_LODEL_PKG[@]" MULTISITE_DATADIR = "[@]MULTISITE_DATA_DIRNAME[@]" MULTISITE_CONTEXTDIR = "[@]MULTISITE_CTX_DIRNAME[@]" MULTISITE_DYNCODE_MODULENAME = 'leapi_dyncode' ##@todo to be generated via autotools -LODEL_PKG_PATH = '/usr/lib/python3/dist-package/lodel' LODELSITE_CONFDIR = 'lodelsites.conf.d'