67 lines
1.9 KiB
Diff
67 lines
1.9 KiB
Diff
From 811310768250b2ae61280f7b63ee1e36e3365893 Mon Sep 17 00:00:00 2001
|
|
From: Zdenek Dohnal <zdohnal@redhat.com>
|
|
Date: Thu, 5 May 2022 15:58:30 +0200
|
|
Subject: [PATCH] configure.ac: Don't hardcode a path into .service file
|
|
|
|
---
|
|
configure | 3 ++-
|
|
configure.ac | 5 ++++-
|
|
lprint.service => lprint.service.in | 2 +-
|
|
3 files changed, 7 insertions(+), 3 deletions(-)
|
|
rename lprint.service => lprint.service.in (71%)
|
|
|
|
diff --git a/configure b/configure
|
|
index a8d6f8f..b346b71 100755
|
|
--- a/configure
|
|
+++ b/configure
|
|
@@ -4112,7 +4112,7 @@ then :
|
|
fi
|
|
|
|
|
|
-ac_config_files="$ac_config_files Makefile"
|
|
+ac_config_files="$ac_config_files Makefile lprint.service"
|
|
|
|
cat >confcache <<\_ACEOF
|
|
# This file is a shell script that caches the results of configure
|
|
@@ -4801,6 +4801,7 @@ do
|
|
case $ac_config_target in
|
|
"config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
|
|
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
|
|
+ "lprint.service") CONFIG_FILES="$CONFIG_FILES lprint.service" ;;
|
|
|
|
*) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
|
|
esac
|
|
diff --git a/configure.ac b/configure.ac
|
|
index 5301080..55691bd 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -232,5 +232,8 @@ AC_ARG_WITH(ldflags, AS_HELP_STRING([--with-ldflags=...], [Specify additional LD
|
|
])
|
|
|
|
dnl Generate the Makefile...
|
|
-AC_CONFIG_FILES([Makefile])
|
|
+AC_CONFIG_FILES([
|
|
+ Makefile
|
|
+ lprint.service
|
|
+])
|
|
AC_OUTPUT
|
|
diff --git a/lprint.service b/lprint.service.in
|
|
similarity index 71%
|
|
rename from lprint.service
|
|
rename to lprint.service.in
|
|
index 596865a..301d825 100644
|
|
--- a/lprint.service
|
|
+++ b/lprint.service.in
|
|
@@ -7,7 +7,7 @@ Requires=avahi-daemon.socket
|
|
WantedBy=multi-user.target
|
|
|
|
[Service]
|
|
-ExecStart=/usr/local/bin/lprint server -o log-file=- -o log-level=debug
|
|
+ExecStart=@bindir@/lprint server -o log-file=- -o log-level=debug
|
|
Type=simple
|
|
Restart=on-failure
|
|
|
|
--
|
|
2.35.1
|
|
|