diff options
| author | Steve Dickson <steved@redhat.com> | 2016-08-24 10:13:52 -0400 |
|---|---|---|
| committer | Steve Dickson <steved@redhat.com> | 2016-08-24 10:15:16 -0400 |
| commit | 8cf1e023c9c110087c79daac0a083b5e04458304 (patch) | |
| tree | ad5af16a1f6b724aecbb876032c4d73f140e695d | |
| parent | 21c3ca72fb1b3b4aea30b7cc4989b23daf6bd2dd (diff) | |
| download | nfs-utils-8cf1e023c9c110087c79daac0a083b5e04458304.tar.gz | |
Make location of nfs-utils_env.sh configurable.
A recent patch moved this file to /usr/libexec/...
That directory isn't universal, and doesn't exist on openSUSE or
Debian for example. So change it to use the $libexecdir
directory determined by configure
Signed-off-by: NeilBrown <neilb@suse.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | systemd/nfs-config.service.in (renamed from systemd/nfs-config.service) | 2 |
3 files changed, 8 insertions, 1 deletions
@@ -70,6 +70,7 @@ tests/nsm_client/nlm_sm_inter_svc.c tests/nsm_client/nlm_sm_inter_xdr.c utils/nfsidmap/nfsidmap systemd/nfs-server-generator +systemd/nfs-config.service # cscope database files cscope.* # generic editor backup et al diff --git a/configure.ac b/configure.ac index 1daf5b8..4fb108f 100644 --- a/configure.ac +++ b/configure.ac @@ -511,8 +511,14 @@ AC_SUBST([AM_CFLAGS], ["$my_am_cflags"]) # Make sure that $ACLOCAL_FLAGS are used during a rebuild AC_SUBST([ACLOCAL_AMFLAGS], ["-I $ac_macro_dir \$(ACLOCAL_FLAGS)"]) +# make libexecdir available for substituion in config files +# 2 "evals" needed late to expand variable names. +AC_SUBST([_libexecdir]) +AC_CONFIG_COMMANDS_PRE([eval eval _libexecdir=$libexecdir]) + AC_CONFIG_FILES([ Makefile + systemd/nfs-config.service linux-nfs/Makefile support/Makefile support/export/Makefile diff --git a/systemd/nfs-config.service b/systemd/nfs-config.service.in index bd69e84..e89dc54 100644 --- a/systemd/nfs-config.service +++ b/systemd/nfs-config.service.in @@ -10,4 +10,4 @@ Type=oneshot # incorporated. Having "RemainAfterExit=no" (the default) # ensures this happens. RemainAfterExit=no -ExecStart=/usr/libexec/nfs-utils/nfs-utils_env.sh +ExecStart=@_libexecdir@/nfs-utils/nfs-utils_env.sh |