From a493c2ed6a5016764deda5207535b1e4929718f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20W=C3=A4ckerlin?= <marc@merkur.int.swisssign.net>
Date: Wed, 18 Jul 2018 14:08:51 +0200
Subject: [PATCH] reorganisation of etc

---
 bootstrap.sh                         |  3 ++-
 configure.ac                         |  3 ++-
 {scripts => etc}/backup.conf         |  0
 {scripts => etc}/check_backup.cfg.in |  0
 etc/makefile.am                      | 13 +++++++++++++
 makefile.am                          |  8 ++++++--
 scripts/makefile.am                  |  9 ++-------
 7 files changed, 25 insertions(+), 11 deletions(-)
 rename {scripts => etc}/backup.conf (100%)
 rename {scripts => etc}/check_backup.cfg.in (100%)
 create mode 100644 etc/makefile.am

diff --git a/bootstrap.sh b/bootstrap.sh
index ffcbfc9..69c0994 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -1773,7 +1773,7 @@ $(if testtag AX_USE_ETC; then
 
 cat <<EOF2
 %config
-/etc/*
+/etc
 
 EOF2
 fi)
@@ -1882,6 +1882,7 @@ $(if test -e README.md -a ! -e README; then
 cat <<EOF2
 
 README: README.md
+	cp README.md README
 
 CLEANFILES = README
 EOF2
diff --git a/configure.ac b/configure.ac
index a6761c9..765fab2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -24,6 +24,7 @@ AX_USE_SCRIPTS
 AX_USE_DOXYGEN
 AX_USE_DEBIAN_PACKAGING([utils])
 AX_USE_RPM_PACKAGING([Applications/System])
+AX_USE_ETC
 #AX_USE_CPPUNIT
 #AX_BUILD_TEST
 #AX_BUILD_EXAMPLES
@@ -37,7 +38,7 @@ AX_USE_RPM_PACKAGING([Applications/System])
 # create scripts from in-files
 AC_CONFIG_FILES([scripts/backup-generic scripts/check_backup
                  scripts/backup-generic.texi scripts/variables.texi
-                 scripts/check_backup.cfg scripts/escalate-backup
+                 etc/check_backup.cfg scripts/escalate-backup
                  scripts/setup-backup])
 
 # create output
diff --git a/scripts/backup.conf b/etc/backup.conf
similarity index 100%
rename from scripts/backup.conf
rename to etc/backup.conf
diff --git a/scripts/check_backup.cfg.in b/etc/check_backup.cfg.in
similarity index 100%
rename from scripts/check_backup.cfg.in
rename to etc/check_backup.cfg.in
diff --git a/etc/makefile.am b/etc/makefile.am
new file mode 100644
index 0000000..1fed8ba
--- /dev/null
+++ b/etc/makefile.am
@@ -0,0 +1,13 @@
+## @id $Id$
+
+##       1         2         3         4         5         6         7         8
+## 45678901234567890123456789012345678901234567890123456789012345678901234567890
+
+EXTRA_DIST = check_backup.cfg.in
+
+dist_sysconf_DATA = backup.conf
+
+icingapluginnrpeconfigdir = ${sysconfdir}/nagios/nrpe.d
+icingapluginnrpeconfig_DATA = check_backup.cfg
+
+MAINTAINERCLEANFILES = makefile.in
diff --git a/makefile.am b/makefile.am
index 573807c..4ab98f8 100644
--- a/makefile.am
+++ b/makefile.am
@@ -2,13 +2,13 @@
 ##
 ## This file has been added:
 ##  - by bootstrap.sh
-##  -  on Wed, 18 July 2018 10:52:08 +0200
+##  -  on Wed, 18 July 2018 13:59:38 +0200
 ## Feel free to change it or even remove and rebuild it, up to your needs
 ##
 ##       1         2         3         4         5         6         7         8
 ## 45678901234567890123456789012345678901234567890123456789012345678901234567890
 
-SUBDIRS = scripts doc
+SUBDIRS = etc scripts doc
 
 desktopdir = ${datadir}/applications
 desktop_DATA = @PACKAGE_DESKTOP@
@@ -23,4 +23,8 @@ dist_noinst_DATA = ax_check_qt.m4 bootstrap.sh				\
                     sql-to-dot.sed
 dist_doc_DATA = AUTHORS NEWS README.md COPYING INSTALL ChangeLog
 
+README: README.md
+	cp README.md README
+
+CLEANFILES = README
 MAINTAINERCLEANFILES = makefile.in
diff --git a/scripts/makefile.am b/scripts/makefile.am
index fff3b95..927f39f 100644
--- a/scripts/makefile.am
+++ b/scripts/makefile.am
@@ -4,19 +4,14 @@
 ## 45678901234567890123456789012345678901234567890123456789012345678901234567890
 
 EXTRA_DIST = backup-generic.in setup-backup.in check_backup.in	\
-             check_backup.cfg.in escalate-backup.in		\
-             icinga-monitoring.png variables.texi.in		\
-             backup-generic.texi.in
+             escalate-backup.in icinga-monitoring.png		\
+             variables.texi.in backup-generic.texi.in
 
 sbin_SCRIPTS = backup-generic setup-backup escalate-backup
-dist_sysconf_DATA = backup.conf
 
 icingaplugindir = ${libdir}/nagios/plugins
 icingaplugin_SCRIPTS = check_backup
 
-icingapluginnrpeconfigdir = ${sysconfdir}/nagios/nrpe.d
-icingapluginnrpeconfig_DATA = check_backup.cfg
-
 info_TEXINFOS = 
 backup_generic_TEXINFOS = backup-generic.texi variables.texi