From 1cc998eb60be483bfbd6aa04bca11641bcf99954 Mon Sep 17 00:00:00 2001 From: Joachim Nilsson Date: Mon, 22 Jan 2018 08:41:00 +0100 Subject: [PATCH] Distribute and install contrib/ directory with all examples Signed-off-by: Joachim Nilsson --- Makefile.am | 2 +- configure.ac | 9 ++++++- contrib/Makefile.am | 4 +++ contrib/alpine/Makefile.am | 5 ++++ contrib/alpine/finit.d/Makefile.am | 25 +++++++++++++++++++ contrib/alpine/finit.d/available/Makefile.am | 4 +++ contrib/debian/Makefile.am | 4 +++ contrib/debian/finit.d/Makefile.am | 26 ++++++++++++++++++++ contrib/debian/finit.d/available/Makefile.am | 5 ++++ contrib/debian/grub.d/Makefile.am | 3 +++ contrib/void/Makefile.am | 4 +++ contrib/void/finit.d/Makefile.am | 25 +++++++++++++++++++ contrib/void/finit.d/available/Makefile.am | 5 ++++ 13 files changed, 119 insertions(+), 2 deletions(-) create mode 100644 contrib/Makefile.am create mode 100644 contrib/alpine/Makefile.am create mode 100644 contrib/alpine/finit.d/Makefile.am create mode 100644 contrib/alpine/finit.d/available/Makefile.am create mode 100644 contrib/debian/Makefile.am create mode 100644 contrib/debian/finit.d/Makefile.am create mode 100644 contrib/debian/finit.d/available/Makefile.am create mode 100644 contrib/debian/grub.d/Makefile.am create mode 100644 contrib/void/Makefile.am create mode 100644 contrib/void/finit.d/Makefile.am create mode 100644 contrib/void/finit.d/available/Makefile.am diff --git a/Makefile.am b/Makefile.am index 0e209176..598fad5c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,5 @@ ACLOCAL_AMFLAGS = -I m4 -SUBDIRS = docs plugins src +SUBDIRS = contrib docs plugins src bin_SCRIPT = service doc_DATA = README.md LICENSE contrib/finit.conf EXTRA_DIST = README.md LICENSE ChangeLog.md contrib/finit.conf diff --git a/configure.ac b/configure.ac index 37a8acf6..de334e6a 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,14 @@ AM_SILENT_RULES([yes]) AC_CONFIG_SRCDIR([src/finit.c]) AC_CONFIG_HEADER([config.h]) -AC_CONFIG_FILES([Makefile docs/Makefile plugins/Makefile src/Makefile]) +AC_CONFIG_FILES([Makefile + contrib/Makefile + contrib/alpine/Makefile contrib/alpine/finit.d/Makefile contrib/alpine/finit.d/available/Makefile + contrib/debian/Makefile contrib/debian/finit.d/Makefile contrib/debian/finit.d/available/Makefile contrib/debian/grub.d/Makefile + contrib/void/Makefile contrib/void/finit.d/Makefile contrib/void/finit.d/available/Makefile + docs/Makefile + plugins/Makefile + src/Makefile]) # Older versions of autoconf (<2.58) do not have AC_CONFIG_MACRO_DIR() #m4_include([m4/plugin.m4]) diff --git a/contrib/Makefile.am b/contrib/Makefile.am new file mode 100644 index 00000000..19522208 --- /dev/null +++ b/contrib/Makefile.am @@ -0,0 +1,4 @@ +SUBDIRS = alpine debian void +docsdir := @docdir@/contrib +docs_DATA = README.md finit.conf +EXTRA_DIST = $(docs_DATA) diff --git a/contrib/alpine/Makefile.am b/contrib/alpine/Makefile.am new file mode 100644 index 00000000..48e6da94 --- /dev/null +++ b/contrib/alpine/Makefile.am @@ -0,0 +1,5 @@ +SUBDIRS = finit.d +docsdir := @docdir@/contrib/alpine +docs_DATA = README.md finit.conf alpine-release build.sh install.sh rc.local +EXTRA_DIST = $(docs_DATA) + diff --git a/contrib/alpine/finit.d/Makefile.am b/contrib/alpine/finit.d/Makefile.am new file mode 100644 index 00000000..1a035039 --- /dev/null +++ b/contrib/alpine/finit.d/Makefile.am @@ -0,0 +1,25 @@ +SUBDIRS = available +docsdir := @docdir@/contrib/alpine/finit.d +d_LINKS = dropbear.conf getty.conf keymap.conf modules.conf klogd.conf syslogd.conf + +install-exec-hook: + for file in $(d_LINKS); do \ + lnk=$(DESTDIR)$(docsdir)/$$file; \ + src=available/$$file; \ + if [ -e $$lnk ]; then \ + echo "Skipping $$lnk exists."; \ + else \ + $(LN_S) $$src $$lnk; \ + fi; \ + done + + +uninstall-hook: + @for file in $(d_LINKS); do \ + lnk=$(DESTDIR)$(docsdir)/$$file; \ + src=available/$$file; \ + if [ "`readlink $$lnk`" != "$$src" ]; then \ + continue; \ + fi; \ + $(RM) $$lnk; \ + done diff --git a/contrib/alpine/finit.d/available/Makefile.am b/contrib/alpine/finit.d/available/Makefile.am new file mode 100644 index 00000000..f712b81c --- /dev/null +++ b/contrib/alpine/finit.d/available/Makefile.am @@ -0,0 +1,4 @@ +docsdir := @docdir@/contrib/alpine/finit.d/available +docs_DATA = acpid.conf crond.conf dropbear.conf getty.conf keymap.conf \ + lxdm.conf modules.conf ntpd.conf klogd.conf syslogd.conf +EXTRA_DIST = $(docs_DATA) diff --git a/contrib/debian/Makefile.am b/contrib/debian/Makefile.am new file mode 100644 index 00000000..be2f8933 --- /dev/null +++ b/contrib/debian/Makefile.am @@ -0,0 +1,4 @@ +SUBDIRS = finit.d grub.d +docsdir := @docdir@/contrib/debian +docs_DATA = README.md finit.conf os-release build.sh install.sh +EXTRA_DIST = $(docs_DATA) diff --git a/contrib/debian/finit.d/Makefile.am b/contrib/debian/finit.d/Makefile.am new file mode 100644 index 00000000..63877bb2 --- /dev/null +++ b/contrib/debian/finit.d/Makefile.am @@ -0,0 +1,26 @@ +SUBDIRS = available +docsdir := @docdir@/contrib/debian/finit.d +d_LINKS = console-setup.conf getty.conf keyboard-setup.conf \ + modules.conf rsyslogd.conf sshd.conf + +install-exec-hook: + for file in $(d_LINKS); do \ + lnk=$(DESTDIR)$(docsdir)/$$file; \ + src=available/$$file; \ + if [ -e $$lnk ]; then \ + echo "Skipping $$lnk exists."; \ + else \ + $(LN_S) $$src $$lnk; \ + fi; \ + done + + +uninstall-hook: + @for file in $(d_LINKS); do \ + lnk=$(DESTDIR)$(docsdir)/$$file; \ + src=available/$$file; \ + if [ "`readlink $$lnk`" != "$$src" ]; then \ + continue; \ + fi; \ + $(RM) $$lnk; \ + done diff --git a/contrib/debian/finit.d/available/Makefile.am b/contrib/debian/finit.d/available/Makefile.am new file mode 100644 index 00000000..31d806d4 --- /dev/null +++ b/contrib/debian/finit.d/available/Makefile.am @@ -0,0 +1,5 @@ +docsdir := @docdir@/contrib/debian/finit.d/available +docs_DATA = acpid.conf console-setup.conf getty.conf \ + keyboard-setup.conf lightdm.conf modules.conf \ + ntpclient.conf rsyslogd.conf sshd.conf xdm.conf +EXTRA_DIST = $(docs_DATA) diff --git a/contrib/debian/grub.d/Makefile.am b/contrib/debian/grub.d/Makefile.am new file mode 100644 index 00000000..c3629195 --- /dev/null +++ b/contrib/debian/grub.d/Makefile.am @@ -0,0 +1,3 @@ +docsdir := @docdir@/contrib/debian/grub.d +docs_DATA = 40_custom +EXTRA_DIST = $(docs_DATA) diff --git a/contrib/void/Makefile.am b/contrib/void/Makefile.am new file mode 100644 index 00000000..8e8cfd6c --- /dev/null +++ b/contrib/void/Makefile.am @@ -0,0 +1,4 @@ +SUBDIRS = finit.d +docsdir := @docdir@/contrib/void +docs_DATA = README.md finit.conf build.sh install.sh rc.local xbps +EXTRA_DIST = $(docs_DATA) diff --git a/contrib/void/finit.d/Makefile.am b/contrib/void/finit.d/Makefile.am new file mode 100644 index 00000000..f53dfef6 --- /dev/null +++ b/contrib/void/finit.d/Makefile.am @@ -0,0 +1,25 @@ +SUBDIRS = available +docsdir := @docdir@/contrib/void/finit.d +d_LINKS = acpid.conf dhcpcd.conf getty.conf sshd.conf uuidd.conf + +install-exec-hook: + for file in $(d_LINKS); do \ + lnk=$(DESTDIR)$(docsdir)/$$file; \ + src=available/$$file; \ + if [ -e $$lnk ]; then \ + echo "Skipping $$lnk exists."; \ + else \ + $(LN_S) $$src $$lnk; \ + fi; \ + done + + +uninstall-hook: + @for file in $(d_LINKS); do \ + lnk=$(DESTDIR)$(docsdir)/$$file; \ + src=available/$$file; \ + if [ "`readlink $$lnk`" != "$$src" ]; then \ + continue; \ + fi; \ + $(RM) $$lnk; \ + done diff --git a/contrib/void/finit.d/available/Makefile.am b/contrib/void/finit.d/available/Makefile.am new file mode 100644 index 00000000..476ee1ca --- /dev/null +++ b/contrib/void/finit.d/available/Makefile.am @@ -0,0 +1,5 @@ +docsdir := @docdir@/contrib/void/finit.d/available +docs_DATA = acpid.conf crond.conf dhcpcd.conf dmeventd.conf getty.conf \ + keymap.conf klogd.conf lxdm.conf modules.conf ntpd.conf \ + sshd.conf syslogd.conf uuidd.conf +EXTRA_DIST = $(docs_DATA)