From 1181aff43f327bf7df023281a02adfe258b97813 Mon Sep 17 00:00:00 2001 From: Guillaume Rousse <guillaume.rousse@renater.fr> Date: Fri, 8 Dec 2017 14:52:09 +0100 Subject: [PATCH] make 'make distcheck' happier --- bin/Makefile.am | 2 ++ conf/Makefile.am | 15 ++++++++++----- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/bin/Makefile.am b/bin/Makefile.am index 4dae5aa..bb7b179 100644 --- a/bin/Makefile.am +++ b/bin/Makefile.am @@ -2,6 +2,8 @@ bin_SCRIPTS = account-manager.pl www_SCRIPTS = account-manager.cgi +CLEANFILES = $(bin_SCRIPTS) $(www_SCRIPTS) + EXTRA_DIST = account-manager.pl.in account-manager.cgi.in account-manager.pl: Makefile account-manager.pl.in diff --git a/conf/Makefile.am b/conf/Makefile.am index 16ddf8b..4e9b2b6 100644 --- a/conf/Makefile.am +++ b/conf/Makefile.am @@ -1,5 +1,7 @@ noinst_DATA = manager.conf +CLEANFILES = $(noinst_DATA) + EXTRA_DIST = manager.conf.in manager.conf: Makefile manager.conf.in @@ -9,10 +11,13 @@ manager.conf: Makefile manager.conf.in < $(srcdir)/$@.in > $@ chmod +x $@ - install-data-local: - if [ -f $(DESTDIR)$(sysconfdir)/manager.conf ]; then \ - $(INSTALL_DATA) $(srcdir)/manager.conf $(DESTDIR)$(sysconfdir)/manager.conf.new; \ - else \ - $(INSTALL_DATA) $(srcdir)/manager.conf $(DESTDIR)$(sysconfdir)/manager.conf; \ + $(mkinstalldirs) $(DESTDIR)$(sysconfdir) + if [ -f $(DESTDIR)$(sysconfdir)/manager.conf ]; then \ + $(INSTALL_DATA) manager.conf $(DESTDIR)$(sysconfdir)/manager.conf.new; \ + else \ + $(INSTALL_DATA) manager.conf $(DESTDIR)$(sysconfdir)/manager.conf; \ fi + +uninstall-local: + rm -f $(DESTDIR)$(sysconfdir)/manager.conf -- GitLab