Browse Source

Autotools fix for deb target

Recent changes broke the 'deb' target building process. Now fixed and
back at work !
Quentin Bonaventure 8 years ago
parent
commit
87de9d653e
3 changed files with 10 additions and 3 deletions
  1. 1
    1
      Makefile.am
  2. 1
    1
      progs/Makefile.am
  3. 8
    1
      progs/slim/Makefile.am

+ 1
- 1
Makefile.am View File

@@ -1,5 +1,5 @@
1 1
 SUBDIRS = lodel progs
2
-EXTRA_DIST = runtest examples tests debian
2
+EXTRA_DIST = runtest examples tests debian Makefile-common.am.inc
3 3
 CLEANFILES = runtest
4 4
 
5 5
 lodel2_localstate_DATA =

+ 1
- 1
progs/Makefile.am View File

@@ -36,4 +36,4 @@ create_multisite: create_multisite.sh
36 36
 
37 37
 install-data-hook:
38 38
 	chmod +x ${DESTDIR}$(datadir)/lodel2/scripts/*
39
-
39
+	

+ 8
- 1
progs/slim/Makefile.am View File

@@ -1,6 +1,6 @@
1 1
 bin_SCRIPTS = slim
2 2
 CLEANFILES = $(bin_SCRIPTS) slim_instances.json slim_instances_pid.json
3
-EXTRA_DIST = slim.py install_model emfile.pickle
3
+EXTRA_DIST = slim.py install_model multisite_install_model emfile.pickle
4 4
 
5 5
 lodel2_scripts_dir = $(datadir)/lodel2/scripts
6 6
 
@@ -14,6 +14,11 @@ install_model__DATA = 	install_model/loader.py \
14 14
 			install_model/lodel_admin.py \
15 15
 			install_model/Makefile 
16 16
 
17
+multisite_install_model_dir = $(lodel2datadir)/multisite_install_model
18
+multisite_install_model__DATA = multisite_install_model/lodel_admin.py \
19
+			multisite_install_model/Makefile 
20
+
21
+
17 22
 slim_conf_model_dir = $(install_model_dir)/conf.d/
18 23
 slim_conf_model__DATA = install_model/conf.d/lodel2.ini
19 24
 
@@ -28,6 +33,7 @@ slim_instances_pid.json:
28 33
 do_subst = sed -e 's,\[@\]LODEL2_PROGSDIR\[@\],$(lodel2_scripts_dir),g' \
29 34
 	-e 's,\[@\]SLIM_DATADIR\[@\],$(slimdatadir),g' \
30 35
 	-e 's,\[@\]INSTALLMODEL_DIR\[@\],$(install_model_dir),g' \
36
+	-e 's,\[@\]MULTISITE_INSTALLMODEL_DIR\[@\],$(multisite_install_model_dir),g' \
31 37
 	-e 's,\[@\]SLIM_VAR_DIR\[@\],$(slim_var_dir),g' \
32 38
 	-e 's,\[@\]PKGPYTHONDIR\[@\],$(pkgpythondir),g'
33 39
 
@@ -37,4 +43,5 @@ slim: slim.py
37 43
 
38 44
 install-data-hook:
39 45
 	chmod +x ${DESTDIR}$(install_model_dir)/lodel_admin.py
46
+	chmod +x ${DESTDIR}$(multisite_install_model_dir)/lodel_admin.py
40 47
 

Loading…
Cancel
Save