summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Graf <tgraf@suug.ch>2014-07-06 13:41:04 +0200
committerThomas Graf <tgraf@suug.ch>2014-07-06 13:41:04 +0200
commite30ab3ad3d352cffc4b7fb29795cab5372f02ddd (patch)
tree91a104a7ba1b4424696844e792e644e145bcc71c
parentbe8ef18b742757e2a722bdc60bca546553f4d15c (diff)
Install bmon.conf in examples dir in package doc
Defaults are fine, no need to clutter sysconfdir with a useless default config file. Signed-off-by: Thomas Graf <tgraf@suug.ch>
-rw-r--r--Makefile.am8
-rw-r--r--configure.ac1
-rw-r--r--examples/Makefile.am6
-rw-r--r--examples/bmon.conf (renamed from etc/bmon.conf)0
4 files changed, 8 insertions, 7 deletions
diff --git a/Makefile.am b/Makefile.am
index 6570a4e..48aca83 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,10 +2,4 @@
ACLOCAL_AMFLAGS = -I m4
-SUBDIRS = src man include
-
-pkgsysconfdir = $(sysconfdir)
-pkgsysconf_DATA = etc/bmon.conf
-
-EXTRA_DIST = \
- $(pkgsysconf_DATA)
+SUBDIRS = src man include examples
diff --git a/configure.ac b/configure.ac
index bd1724f..411c98e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -194,6 +194,7 @@ Makefile
include/Makefile
src/Makefile
man/Makefile
+examples/Makefile
])
AC_OUTPUT
diff --git a/examples/Makefile.am b/examples/Makefile.am
new file mode 100644
index 0000000..a85ff55
--- /dev/null
+++ b/examples/Makefile.am
@@ -0,0 +1,6 @@
+# -*- Makefile -*-
+
+exampledir = $(datarootdir)/doc/@PACKAGE@/examples
+example_DATA = bmon.conf
+
+EXTRA_DIST = $(example_DATA)
diff --git a/etc/bmon.conf b/examples/bmon.conf
index d545229..d545229 100644
--- a/etc/bmon.conf
+++ b/examples/bmon.conf