Autotools propagation of multisite variables

Better access to a few variables into the .am files. Allows for single
point of definition of variables required accross various .am.
For concerns separation, may probably switch from Makefile-common.am.inc
to Makefile-multisite.am.inc.

Makefile-common.am.inc

@@ -0,0 +1,2 @@
+lodel2_multisite_data_dirname=sites_data
+lodel2_multisite_ctx_dirname=.sites_contexts/lodelsites

lodel/Makefile.am

@@ -1,3 +1,5 @@
+include $(top_builddir)/Makefile-common.am.inc
+
 SUBDIRS=auth editorial_model leapi plugin settings utils plugins validator mlnamedobject
 EXTRA_DIST = plugins
 lodel_PYTHON = *.py
@@ -14,7 +16,9 @@ gitclean:
 logdir = $(localstatedir)/log/lodel2/
 
 do_subst = sed 	-e 's,\[@\]LODEL2_VARDIR\[@\],$(localstatedir)/lodel2/,g' \
-		-e 's,\[@\]LODEL2_LOGDIR\[@\],$(logdir),g'
+		-e 's,\[@\]LODEL2_LOGDIR\[@\],$(logdir),g' \
+		-e 's,\[@\]MULTISITE_DATA_DIRNAME\[@\],$(lodel2_multisite_data_dirname),g' \
+		-e 's,\[@\]MULTISITE_CTX_DIRNAME\[@\],$(lodel2_multisite_ctx_dirname),g'
 
 
 install-data-hook:

lodel/buildconf.py.am.in

@@ -9,8 +9,8 @@ LODEL2VARDIR="[@]LODEL2_VARDIR[@]"
 LODEL2LOGDIR="[@]LODEL2_LOGDIR[@]"
 
 
-MULTISITE_DATADIR = 'sites_datas'
-MULTISITE_CONTEXTDIR = '.sites_contexts'
+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'

progs/Makefile.am

@@ -1,3 +1,5 @@
+include $(top_builddir)/Makefile-common.am.inc
+
 SUBDIRS=slim
 
 lodel2_scripts_dir = $(datadir)/lodel2/scripts
@@ -8,15 +10,13 @@ EXTRA_DIST = create_instance.sh create_multisite.sh mass_deploy.sh
 lodel2conf_DATA = mass_deploy.cfg
 lodel2confdir=$(sysconfdir)/lodel2
 lodel2statedir=$(localstatedir)/lodel2
-lodelsites_data_dirname=sites_data
-lodelsites_ctx_dirname=.sites_context/lodelsites
 
 do_subst = sed -e 's,\[@\]PKGPYTHONDIR\[@\],$(pkgpythondir),g' \
 		-e 's,\[@\]LODEL2_PROGSDIR\[@\],$(lodel2_scripts_dir),g' \
 		-e 's,\[@\]LODEL2_CONFDIR\[@\],$(lodel2confdir),g' \
 		-e 's,\[@\]LODEL2_VARDIR\[@\],$(lodel2statedir),g' \
-		-e 's,\[@\]LODELSITES_DATA_DIRNAME\[@\],$(lodelsites_data_dirname),g' \
-		-e 's,\[@\]LODELSITES_CTX_DIRNAME\[@\],$(lodelsites_ctx_dirname),g'
+		-e 's,\[@\]LODELSITES_DATA_DIRNAME\[@\],$(lodel2_multisite_data_dirname),g' \
+		-e 's,\[@\]LODELSITES_CTX_DIRNAME\[@\],$(lodel2_multisite_ctx_dirname),g'
 
 #There is clearly a way to factorise those rules
 mass_deploy: mass_deploy.sh
@@ -28,7 +28,6 @@ mass_deploy.cfg:
 
 create_instance: create_instance.sh
 	$(do_subst) < $(srcdir)/create_instance.sh > create_instance
-#	sed -e 's,\[@\]LODELSITES_DATADIR_NAME\[@\],$(lodelsites_datadir_name),g' < $(srcdir)/create_instance.sh > create_instance
 	chmod +x create_instance
 
 create_multisite: create_multisite.sh