Browse Source

Updated builconf with lodel package path

Yann Weber 7 years ago
parent
commit
286e3ffe10
2 changed files with 2 additions and 1 deletions
  1. 1
    0
      lodel/Makefile.am
  2. 1
    1
      lodel/buildconf.py.am.in

+ 1
- 0
lodel/Makefile.am View File

@@ -17,6 +17,7 @@ logdir = $(localstatedir)/log/lodel2/
17 17
 
18 18
 do_subst = sed 	-e 's,\[@\]LODEL2_VARDIR\[@\],$(localstatedir)/lodel2/,g' \
19 19
 		-e 's,\[@\]LODEL2_LOGDIR\[@\],$(logdir),g' \
20
+		-e 's,\[@\]LODEL2_LODEL_PKG\[@\],$(lodeldir),g' \
20 21
 		-e 's,\[@\]MULTISITE_DATA_DIRNAME\[@\],$(lodel2_multisite_data_dirname),g' \
21 22
 		-e 's,\[@\]MULTISITE_CTX_DIRNAME\[@\],$(lodel2_multisite_ctx_dirname),g'
22 23
 

+ 1
- 1
lodel/buildconf.py.am.in View File

@@ -7,11 +7,11 @@ WEBUI=@WEBUI@
7 7
 #Populated by make
8 8
 LODEL2VARDIR="[@]LODEL2_VARDIR[@]"
9 9
 LODEL2LOGDIR="[@]LODEL2_LOGDIR[@]"
10
+LODEL_PKG_PATH = "[@]LODEL2_LODEL_PKG[@]"
10 11
 
11 12
 
12 13
 MULTISITE_DATADIR = "[@]MULTISITE_DATA_DIRNAME[@]"
13 14
 MULTISITE_CONTEXTDIR = "[@]MULTISITE_CTX_DIRNAME[@]"
14 15
 MULTISITE_DYNCODE_MODULENAME = 'leapi_dyncode'
15 16
 ##@todo to be generated via autotools
16
-LODEL_PKG_PATH = '/usr/lib/python3/dist-package/lodel'
17 17
 LODELSITE_CONFDIR = 'lodelsites.conf.d'

Loading…
Cancel
Save