Browse Source

Small Makefile.am changes/bugfixes

Yann Weber 7 years ago
parent
commit
afea7e74e2
2 changed files with 6 additions and 4 deletions
  1. 1
    1
      Makefile.am
  2. 5
    3
      lodel/plugins/Makefile.am

+ 1
- 1
Makefile.am View File

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

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

@@ -4,9 +4,11 @@ pluginsdir=$(pkgpythondir)/plugins
4 4
 lodel2confdir=$(sysconfdir)/lodel2
5 5
 
6 6
 install-data-hook:
7
-	$(MKDIR_P) $(pluginsdir); cp -R * $(pluginsdir) && rm $(pluginsdir)/Makefile* ;\
8
-	$(MKDIR_P) $(lodel2confdir); \
9
-	$(LN_S) -f $(pluginsdir) $(lodel2confdir)
7
+	-@$(MKDIR_P) ${DESTDIR}$(lodel2confdir)
8
+	$(MKDIR_P) ${DESTDIR}$(pluginsdir); cp -R * ${DESTDIR}$(pluginsdir) && rm -v ${DESTDIR}$(pluginsdir)/Makefile* ;
9
+	cd ${DESTDIR};
10
+	$(MKDIR_P) ./$(lodel2confdir);
11
+	$(LN_S) -rt ${DESTDIR}$(lodel2confdir) .$(pluginsdir)
10 12
 
11 13
 uninstall-hook:
12 14
 	-rm -R ${DESTDIR}$(pluginsdir)

Loading…
Cancel
Save