Browse Source

Enhancement of some autotools actions

Warning, may contains some bugs !!!
Yann Weber 7 years ago
parent
commit
163b4cba88
2 changed files with 10 additions and 5 deletions
  1. 5
    2
      Makefile.am
  2. 5
    3
      lodel/plugins/Makefile.am

+ 5
- 2
Makefile.am View File

@@ -37,8 +37,10 @@ install-data-hook:
37 37
 
38 38
 #Making debian package
39 39
 deb: dist
40
-	
41
-	mkdir debian_package; tar -xvf ${PACKAGE}-${VERSION}.tar.gz -C ./debian_package; cd debian_package/${PACKAGE}-${VERSION}; echo "$(pkgpythondir)/plugins $(sysconfdir)/lodel2/plugins" > debian/lodel2.links; dpkg-buildpackage -rfakeroot;
40
+	mkdir debian_package;\
41
+	tar -xvf ${PACKAGE}-${VERSION}.tar.gz -C ./debian_package;\
42
+	cd debian_package/${PACKAGE}-${VERSION};\
43
+	dpkg-buildpackage -rfakeroot;
42 44
 
43 45
 # Test em update ( examples/em_test.pickle )
44 46
 em_test: em_test.py
@@ -71,6 +73,7 @@ cleandoc:
71 73
 #other cleans
72 74
 distclean-local:
73 75
 	-rm -vR debian_package ${PACKAGE}-${VERSION}.tar.gz
76
+	-find . -name Makefile.in -delete
74 77
 
75 78
 gitclean: distclean cleandoc
76 79
 	-rm -vR autom4te.cache/ aclocal.m4 install-sh missing py-compile configure; find ./ -name Makefile.in |xargs rm -v

+ 5
- 3
lodel/plugins/Makefile.am View File

@@ -3,9 +3,11 @@ plugins_PYTHON=__init__.py
3 3
 pluginsdir=$(pkgpythondir)/plugins
4 4
 lodel2confdir=$(sysconfdir)/lodel2
5 5
 
6
-install-data-local:
7
-	mkdir ${DESTDIR}$(pluginsdir); cp -R * ${DESTDIR}$(pluginsdir) && rm ${DESTDIR}$(pluginsdir)/Makefile*
8
-	mkdir -p $(lodel2confdir) && cd $(lodel2confdir) && $(LN_S) -sf $(pluginsdir) plugins
6
+install-data-hook:
7
+	mkdir ${DESTDIR}$(pluginsdir); cp -R * ${DESTDIR}$(pluginsdir) && rm ${DESTDIR}$(pluginsdir)/Makefile* ;\
8
+	cd ${DESTDIR}; \
9
+	mkdir -p ./$(lodel2confdir); \
10
+	ln -rs -t ${DESTDIR}$(lodel2confdir) .$(pluginsdir)
9 11
 
10 12
 uninstall-hook:
11 13
 	-rm -R ${DESTDIR}$(pluginsdir)

Loading…
Cancel
Save