diff options
| author | NeilBrown <neilb@suse.de> | 2014-12-07 10:40:24 -0500 |
|---|---|---|
| committer | Steve Dickson <steved@redhat.com> | 2014-12-07 10:40:24 -0500 |
| commit | 0fbf91a4fd904724ce031d73d282608104c84eac (patch) | |
| tree | a8fd6b7518e7e99e19fb5adbe8a96d15b07e6a21 | |
| parent | 56cfa334c9cf3bccebbd0548706e69f9e201d66d (diff) | |
| download | nfs-utils-0fbf91a4fd904724ce031d73d282608104c84eac.tar.gz | |
Include systemd unit files in "dist" and "install".
New configure option "--with-systemd" will causes systemd
unit files to be installed in /usr/lib/systemd/system.
Alternalte a path can be given:
--with-systemd=/lib/systemd/system
Also, systemd files get included in "make dist" now.
Signed-off-by: NeilBrown <neilb@suse.de>
Signed-off-by: Steve Dickson <steved@redhat.com>
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 11 | ||||
| -rw-r--r-- | systemd/Makefile.am | 32 |
3 files changed, 44 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index 392e7b3..4a2edc6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS = foreign -SUBDIRS = tools support utils linux-nfs tests +SUBDIRS = tools support utils linux-nfs tests systemd MAINTAINERCLEANFILES = Makefile.in diff --git a/configure.ac b/configure.ac index e3af723..a8b1fc3 100644 --- a/configure.ac +++ b/configure.ac @@ -55,6 +55,16 @@ AC_ARG_WITH(start-statd, ) AC_SUBST(startstatd) AC_DEFINE_UNQUOTED(START_STATD, "$startstatd", [Define this to a script which can start statd on mount]) +unitdir=/usr/lib/systemd/system +AC_ARG_WITH(systemd, + [AC_HELP_STRING([--with-systemd@<:@=unit-dir-path@:>@], + [install systemd unit files @<:@Default: no, and path defaults to /usr/lib/systemd/system if not given@:>@])], + test "$withval" = "no" && use_systemd=0 || unitdir=$withval use_systemd=1 + use_systemd=0 + ) + AM_CONDITIONAL(INSTALL_SYSTEMD, [test "$use_systemd" = 1]) + AC_SUBST(unitdir) + AC_ARG_ENABLE(nfsv4, [AC_HELP_STRING([--enable-nfsv4], [enable support for NFSv4 @<:@default=yes@:>@])], @@ -516,6 +526,7 @@ AC_CONFIG_FILES([ utils/showmount/Makefile utils/statd/Makefile utils/osd_login/Makefile + systemd/Makefile tests/Makefile tests/nsm_client/Makefile]) AC_OUTPUT diff --git a/systemd/Makefile.am b/systemd/Makefile.am new file mode 100644 index 0000000..16cf5e6 --- /dev/null +++ b/systemd/Makefile.am @@ -0,0 +1,32 @@ +## Process this file with automake to produce Makefile.in + +MAINTAINERCLEANFILES = Makefile.in + +unit_files = \ + nfs-blkmap.target \ + nfs-client.target \ + \ + auth-rpcgss-module.service \ + nfs-blkmap.service \ + nfs-config.service \ + nfs-idmapd.service \ + nfs-mountd.service \ + nfs-server.service \ + nfs-utils.service \ + rpc-gssd.service \ + rpc-statd-notify.service \ + rpc-statd.service \ + rpc-svcgssd.service \ + \ + proc-fs-nfsd.mount \ + var-lib-nfs-rpc_pipefs.mount + +EXTRA_DIST = $(unit_files) + +unit_dir = /usr/lib/systemd/system + +if INSTALL_SYSTEMD +install-data-hook: $(unit_files) + mkdir -p $(DESTDIR)/$(unitdir) + cp $(unit_files) $(DESTDIR)/$(unitdir) +endif |