diff options
| -rw-r--r-- | configure.ac | 5 | ||||
| -rw-r--r-- | extras/systemd/Makefile.am | 16 |
2 files changed, 9 insertions, 12 deletions
diff --git a/configure.ac b/configure.ac index 40b75ac3d2d..88d2be9a0a0 100644 --- a/configure.ac +++ b/configure.ac @@ -312,10 +312,11 @@ AC_ARG_WITH(mountutildir, AC_SUBST(mountutildir) AC_ARG_WITH(systemddir, - [ --with-systemddir=DIR systemd service files in DIR @<:@/usr/lib/systemd/system@:>@], + [ --with-systemddir=DIR systemd service files in DIR @<:@PREFIX/lib/systemd/system@:>@], [systemddir=$withval], - [systemddir='/usr/lib/systemd/system']) + [systemddir='${prefix}/lib/systemd/system']) AC_SUBST(systemddir) +AM_CONDITIONAL([USE_SYSTEMD], test [ -d '/usr/lib/systemd/system' ]) AC_ARG_WITH(initdir, [ --with-initdir=DIR init.d scripts in DIR @<:@/etc/init.d@:>@], diff --git a/extras/systemd/Makefile.am b/extras/systemd/Makefile.am index 1fbb74593bb..3f0ec89537a 100644 --- a/extras/systemd/Makefile.am +++ b/extras/systemd/Makefile.am @@ -1,11 +1,7 @@ +CLEANFILES = glusterd.service +EXTRA_DIST = glusterd.service.in -CLEANFILES = - -SYSTEMD_DIR = @systemddir@ - -install-exec-local: - @if [ -d $(SYSTEMD_DIR) ]; then \ - $(MKDIR_P) $(DESTDIR)$(SYSTEMD_DIR); \ - $(INSTALL_PROGRAM) glusterd.service $(DESTDIR)$(SYSTEMD_DIR)/; \ - fi - +if USE_SYSTEMD +# systemddir is already defined through configure.ac +systemd_DATA = glusterd.service +endif |