From 7cf275db7362bee7634b435c74327b265324796d Mon Sep 17 00:00:00 2001 From: Andrew Borodin Date: Mon, 20 May 2019 14:51:28 +0300 Subject: [PATCH] VFS: move src/vfs/extfs/helpers/sfs.ini to src/vfs/sfs. Signed-off-by: Andrew Borodin --- src/vfs/extfs/helpers/Makefile.am | 7 +------ src/vfs/sfs/Makefile.am | 9 +++++++++ src/vfs/{extfs/helpers => sfs}/sfs.ini | 0 3 files changed, 10 insertions(+), 6 deletions(-) rename src/vfs/{extfs/helpers => sfs}/sfs.ini (100%) diff --git a/src/vfs/extfs/helpers/Makefile.am b/src/vfs/extfs/helpers/Makefile.am index 06ea7898d..419a388b5 100644 --- a/src/vfs/extfs/helpers/Makefile.am +++ b/src/vfs/extfs/helpers/Makefile.am @@ -1,7 +1,5 @@ extfsdir = $(libexecdir)/@PACKAGE@/extfs.d -EXTFSCONFFILES = sfs.ini - # Files to install and distribute other than extfs scripts EXTFS_MISC = README README.extfs @@ -71,9 +69,6 @@ EXTFS_OUT = \ if ENABLE_VFS extfs_DATA = $(EXTFS_MISC) extfs_SCRIPTS = $(EXTFS_CONST) $(EXTFS_OUT) - -extfsconfdir = $(sysconfdir)/@PACKAGE@ -extfsconf_DATA = $(EXTFSCONFFILES) endif -EXTRA_DIST = $(EXTFS_MISC) $(EXTFS_CONST) $(EXTFSCONFFILES) +EXTRA_DIST = $(EXTFS_MISC) $(EXTFS_CONST) diff --git a/src/vfs/sfs/Makefile.am b/src/vfs/sfs/Makefile.am index 2271c5320..7de97d050 100644 --- a/src/vfs/sfs/Makefile.am +++ b/src/vfs/sfs/Makefile.am @@ -5,3 +5,12 @@ noinst_LTLIBRARIES = libvfs-sfs.la libvfs_sfs_la_SOURCES = \ sfs.c sfs.h + +SFSCONFFILES = sfs.ini + +if ENABLE_VFS_SFS +sfsconfdir = $(sysconfdir)/@PACKAGE@ +sfsconf_DATA = $(SFSCONFFILES) +endif + +EXTRA_DIST = $(SFSCONFFILES) diff --git a/src/vfs/extfs/helpers/sfs.ini b/src/vfs/sfs/sfs.ini similarity index 100% rename from src/vfs/extfs/helpers/sfs.ini rename to src/vfs/sfs/sfs.ini