From afea7e74e2f8cd3eab325b1c50204239a1204af7 Mon Sep 17 00:00:00 2001 From: Yann Date: Wed, 1 Mar 2017 14:59:46 +0100 Subject: [PATCH] Small Makefile.am changes/bugfixes --- Makefile.am | 2 +- lodel/plugins/Makefile.am | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Makefile.am b/Makefile.am index 679be4e..a903f00 100644 --- a/Makefile.am +++ b/Makefile.am @@ -75,6 +75,6 @@ distclean-local: -rm -vR debian_package/${PACKAGE}-${VERSION}.tar.gz gitclean: distclean cleandoc - -rm -vR autom4te.cache/ aclocal.m4 install-sh missing py-compile configure; + -rm -vR autom4te.cache/ aclocal.m4 install-sh missing py-compile configure; find ./ -name Makefile.in |xargs rm -v .PHONY: cleandoc tests doc diff --git a/lodel/plugins/Makefile.am b/lodel/plugins/Makefile.am index 78ad10f..3690c22 100644 --- a/lodel/plugins/Makefile.am +++ b/lodel/plugins/Makefile.am @@ -4,9 +4,11 @@ pluginsdir=$(pkgpythondir)/plugins lodel2confdir=$(sysconfdir)/lodel2 install-data-hook: - $(MKDIR_P) $(pluginsdir); cp -R * $(pluginsdir) && rm $(pluginsdir)/Makefile* ;\ - $(MKDIR_P) $(lodel2confdir); \ - $(LN_S) -f $(pluginsdir) $(lodel2confdir) + -@$(MKDIR_P) ${DESTDIR}$(lodel2confdir) + $(MKDIR_P) ${DESTDIR}$(pluginsdir); cp -R * ${DESTDIR}$(pluginsdir) && rm -v ${DESTDIR}$(pluginsdir)/Makefile* ; + cd ${DESTDIR}; + $(MKDIR_P) ./$(lodel2confdir); + $(LN_S) -rt ${DESTDIR}$(lodel2confdir) .$(pluginsdir) uninstall-hook: -rm -R ${DESTDIR}$(pluginsdir)