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