1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
|
From 3e469b4c4b5c219469b0be299ce75c4fac09afc9 Mon Sep 17 00:00:00 2001
From: Tobias Oetiker <tobi@oetiker.ch>
Date: Mon, 4 Feb 2019 17:17:25 +0100
Subject: [PATCH 2/3] properly add etc files via EXTRA_DIST - fixes #956 some more
Add etc files via EXTRA_DIST - fixes #956 some more
Upstream-Status: Backport [https://github.com/oetiker/rrdtool-1.x/commit/3e469b4c4b5c219469b0be299ce75c4fac09afc9]
Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
---
Makefile.am | 3 +--
Makefile.in | 5 ++---
etc/Makefile.am | 3 +++
etc/Makefile.in | 3 +++
4 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 6bec092e..c3e2c303 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,7 +5,7 @@ RSYNC = rsync --rsh=ssh
# build the following subdirectories
-SUBDIRS = po src bindings tests
+SUBDIRS = po src bindings tests etc
if BUILD_DOCS
SUBDIRS += doc
@@ -20,7 +20,6 @@ EXTRA_DIST = COPYRIGHT CHANGES TODO CONTRIBUTORS THREADS VERSION LICENSE \
rrdtool.spec favicon.ico bootstrap \
libtool \
m4/snprintf.m4 \
- etc/rrdcached-default-redhat etc/rrdcached-init-redhat etc/rrdcached-default-lsb.in \
win32/build-rrdtool.dot win32/build-rrdtool.pdf win32/build-rrdtool.svg \
win32/librrd-4.def win32/librrd-4.rc win32/librrd-4.vcxproj \
win32/Makefile.msc win32/README win32/README-MinGW-w64 win32/rrdcgi.rc win32/rrd_config.h \
diff --git a/Makefile.in b/Makefile.in
index c9b1939f..6a1280e4 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -168,7 +168,7 @@ am__define_uniq_tagged_files = \
ETAGS = etags
CTAGS = ctags
CSCOPE = cscope
-DIST_SUBDIRS = po src bindings tests doc examples
+DIST_SUBDIRS = po src bindings tests etc doc examples
am__DIST_COMMON = $(srcdir)/Makefile.in \
$(top_srcdir)/conftools/compile \
$(top_srcdir)/conftools/config.guess \
@@ -427,12 +427,11 @@ top_srcdir = @top_srcdir@
RSYNC = rsync --rsh=ssh
# build the following subdirectories
-SUBDIRS = po src bindings tests $(am__append_1) $(am__append_2)
+SUBDIRS = po src bindings tests etc $(am__append_1) $(am__append_2)
EXTRA_DIST = COPYRIGHT CHANGES TODO CONTRIBUTORS THREADS VERSION LICENSE \
rrdtool.spec favicon.ico bootstrap \
libtool \
m4/snprintf.m4 \
- etc/rrdcached-default-redhat etc/rrdcached-init-redhat etc/rrdcached-default-lsb.in \
win32/build-rrdtool.dot win32/build-rrdtool.pdf win32/build-rrdtool.svg \
win32/librrd-4.def win32/librrd-4.rc win32/librrd-4.vcxproj \
win32/Makefile.msc win32/README win32/README-MinGW-w64 win32/rrdcgi.rc win32/rrd_config.h \
diff --git a/etc/Makefile.am b/etc/Makefile.am
index f5503f0c..ab763dc8 100644
--- a/etc/Makefile.am
+++ b/etc/Makefile.am
@@ -1,3 +1,6 @@
+EXTRA_DIST = rrdcached-default-redhat rrdcached-init-redhat rrdcached-default-lsb.in \
+ rrdcached.socket.in rrdcached.service.in
+
if HAVE_SYSTEMD
systemdsystemunit_DATA = \
etc/rrdcached.socket \
diff --git a/etc/Makefile.in b/etc/Makefile.in
index c67f9214..74b914b9 100644
--- a/etc/Makefile.in
+++ b/etc/Makefile.in
@@ -364,6 +364,9 @@ target_vendor = @target_vendor@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
+EXTRA_DIST = rrdcached-default-redhat rrdcached-init-redhat rrdcached-default-lsb.in \
+ rrdcached.socket.in rrdcached.service.in
+
@HAVE_SYSTEMD_TRUE@systemdsystemunit_DATA = \
@HAVE_SYSTEMD_TRUE@ etc/rrdcached.socket \
@HAVE_SYSTEMD_TRUE@ etc/rrdcached.service
--
2.17.1
|
