From e5a324dc2bc8d5bc0e416f2ab9baf797172796d3 Mon Sep 17 00:00:00 2001 From: Corey Minyard Date: Thu, 6 Jul 2023 14:36:37 -0500 Subject: [PATCH] Rework gtlsshd.service It has a reference to where gtlsshd is installed, so do a substitution for it. Unfortunately, autoconf's substitution won't work, so we have to do it ourselves. Signed-off-by: Corey Minyard --- tools/Makefile.am | 9 +++++++-- tools/{gtlsshd.service => gtlsshd.service.in} | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) rename tools/{gtlsshd.service => gtlsshd.service.in} (81%) diff --git a/tools/Makefile.am b/tools/Makefile.am index 65068e9b..7e2bcd0d 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -13,6 +13,8 @@ EXTRA_PROGRAMS = gtlsshd gtlssh gmdns gtlssh-keygen gensio_pty_helper bin_SCRIPTS = @GTLSSYNC@ greflector EXTRA_SCRIPTS = gtlssync +noinst_DATA = gtlsshd.service + greflector: $(top_builddir)/tests/reflector.py cp $(top_builddir)/tests/reflector.py $@ @@ -49,6 +51,9 @@ gtlsshd_LDADD = libgtlssh.a libgensiotool.a $(top_builddir)/lib/libgensioosh.la\ $(top_builddir)/lib/libgensio.la \ @PAMLIB@ @OPENSSL_LIBS@ +gtlsshd.service: ${srcdir}/gtlsshd.service.in + sed "s%@gtlsshdbindir@%${sbindir}%" $< >$@ + gsound_SOURCES = gensiosound.c gsound_LDADD = $(top_builddir)/lib/libgensioosh.la \ $(top_builddir)/lib/libgensio.la libgensiotool.a @@ -64,7 +69,7 @@ man1_MANS = gensiot.1 @GTLSSHMAN@ @GTLSSH_KEYGENMAN@ @GTLSSYNCMAN@ @GMDNSMAN@ \ man8_MANS = @GTLSSHDMAN@ endif -EXTRA_DIST = $(manpages) gtlssync +EXTRA_DIST = $(manpages) gtlssync gtlsshd.service.in clean-local: - rm -f gtlssh-keygen greflector + rm -f gtlssh-keygen greflector gtlsshd.service diff --git a/tools/gtlsshd.service b/tools/gtlsshd.service.in similarity index 81% rename from tools/gtlsshd.service rename to tools/gtlsshd.service.in index b42a3861..3dd67cc7 100644 --- a/tools/gtlsshd.service +++ b/tools/gtlsshd.service.in @@ -5,7 +5,7 @@ Documentation=man:gtlsshd(8) [Service] Type=simple -ExecStart=/usr/local/sbin/gtlsshd --nodaemon +ExecStart=@gtlsshdbindir@/gtlsshd --nodaemon StandardOutput=null Restart=on-failure