From aec9065bdcc7ec3661dc0f05681450c2584a0f77 Mon Sep 17 00:00:00 2001 From: Ryusuke Konishi Date: Mon, 17 Oct 2016 00:28:21 +0900 Subject: [PATCH] nilfs_cleanerd.conf: migrate to etc source directory Add etc source directory and move sbin/cleanerd/nilfs_cleanerd.conf into the directory. Signed-off-by: Ryusuke Konishi --- Makefile.am | 2 +- configure.ac | 1 + etc/Makefile.am | 3 +++ {sbin/cleanerd => etc}/nilfs_cleanerd.conf | 0 sbin/cleanerd/Makefile.am | 2 -- 5 files changed, 5 insertions(+), 3 deletions(-) create mode 100644 etc/Makefile.am rename {sbin/cleanerd => etc}/nilfs_cleanerd.conf (100%) diff --git a/Makefile.am b/Makefile.am index cf79a43..b010881 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,7 +2,7 @@ ACLOCAL_AMFLAGS = -I m4 -SUBDIRS = lib bin sbin include man scripts +SUBDIRS = lib bin sbin include man etc scripts dist_noinst_SCRIPTS = autogen.sh diff --git a/configure.ac b/configure.ac index 9b0a835..15864d9 100644 --- a/configure.ac +++ b/configure.ac @@ -188,6 +188,7 @@ AC_SUBST([localstatedir], [/var]) AC_CONFIG_FILES([Makefile bin/Makefile + etc/Makefile include/Makefile lib/Makefile man/Makefile diff --git a/etc/Makefile.am b/etc/Makefile.am new file mode 100644 index 0000000..231e58c --- /dev/null +++ b/etc/Makefile.am @@ -0,0 +1,3 @@ +## Makefile.am + +dist_sysconf_DATA = nilfs_cleanerd.conf diff --git a/sbin/cleanerd/nilfs_cleanerd.conf b/etc/nilfs_cleanerd.conf similarity index 100% rename from sbin/cleanerd/nilfs_cleanerd.conf rename to etc/nilfs_cleanerd.conf diff --git a/sbin/cleanerd/Makefile.am b/sbin/cleanerd/Makefile.am index 3a5335d..b6a90c1 100644 --- a/sbin/cleanerd/Makefile.am +++ b/sbin/cleanerd/Makefile.am @@ -12,6 +12,4 @@ nilfs_cleanerd_CPPFLAGS = -I$(top_srcdir)/include \ # Use -static option to make nilfs_cleanerd self-contained. nilfs_cleanerd_LDFLAGS = -static -dist_sysconf_DATA = nilfs_cleanerd.conf - EXTRA_DIST = .gitignore