Browse Source

Fixed make deb failures (#250)

Quentin Bonaventure 8 years ago
parent
commit
e2c39e7b96
3 changed files with 10 additions and 9 deletions
  1. 2
    3
      Makefile.am
  2. 5
    2
      configure.ac
  3. 3
    4
      lodel/plugins/Makefile.am

+ 2
- 3
Makefile.am View File

@@ -72,10 +72,9 @@ cleandoc:
72 72
 
73 73
 #other cleans
74 74
 distclean-local:
75
-	-rm -vR debian_package ${PACKAGE}-${VERSION}.tar.gz
76
-	-find . -name Makefile.in -delete
75
+	-rm -vR debian_package/${PACKAGE}-${VERSION}.tar.gz
77 76
 
78 77
 gitclean: distclean cleandoc
79
-	-rm -vR autom4te.cache/ aclocal.m4 install-sh missing py-compile configure; find ./ -name Makefile.in |xargs rm -v
78
+	-rm -vR autom4te.cache/ aclocal.m4 install-sh missing py-compile configure;
80 79
 
81 80
 .PHONY: cleandoc tests doc

+ 5
- 2
configure.ac View File

@@ -1,4 +1,4 @@
1
-AC_INIT([lodel], [0.1], [contact@openedition.org])
1
+AC_INIT([lodel2], [0.1], [contact@openedition.org])
2 2
 
3 3
 AM_INIT_AUTOMAKE
4 4
 
@@ -17,7 +17,7 @@ AC_CONFIG_FILES([Makefile \
17 17
 	lodel/utils/Makefile \
18 18
 	progs/Makefile \
19 19
 	progs/slim/Makefile \
20
-	lodel/plugins/Makefile \
20
+	lodel/plugins/Makefile
21 21
 ])
22 22
 
23 23
 
@@ -27,6 +27,8 @@ AC_CONFIG_FILES([Makefile \
27 27
 #pyconfigure macros are prefixed by PC_
28 28
 ###
29 29
 AC_PROG_LN_S
30
+AC_PROG_MKDIR_P
31
+
30 32
 m4_include([m4/python.m4]) # Patched version of aclocal python.m4 file
31 33
 m4_include([m4/python_pyconfigure.m4]) #Renamed because we use a patched version of aclocal python.m4 file
32 34
 m4_define(python_min_ver, 3.4.2)
@@ -56,6 +58,7 @@ PC_PYTHON_CHECK_MODULE_VERSION([pymongo], [2.7], [2.8], ,
56 58
 	AC_SUBST([PYMONGO], 'False')
57 59
 )
58 60
 
61
+
59 62
 #Documentation checks
60 63
 AC_SUBST([DOCOK], 'OK')
61 64
 AC_CHECK_PROGS([DOXYGEN], [doxygen])

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

@@ -4,10 +4,9 @@ pluginsdir=$(pkgpythondir)/plugins
4 4
 lodel2confdir=$(sysconfdir)/lodel2
5 5
 
6 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)
7
+	$(MKDIR_P) $(pluginsdir); cp -R * $(pluginsdir) && rm $(pluginsdir)/Makefile* ;\
8
+	$(MKDIR_P) $(lodel2confdir); \
9
+	$(LN_S) $(pluginsdir) $(lodel2confdir)/plugins
11 10
 
12 11
 uninstall-hook:
13 12
 	-rm -R ${DESTDIR}$(pluginsdir)

Loading…
Cancel
Save