From 9e31512268b3e2c5e6ab001997f56f6607223c3e Mon Sep 17 00:00:00 2001
From: Guillaume Rousse <guillaume.rousse@renater.fr>
Date: Tue, 1 Feb 2022 10:47:59 +0100
Subject: [PATCH] no need for substitution at install time anymore
---
conf/Makefile.am | 12 ++++--------
conf/{manager.conf.in => manager.conf} | 2 --
2 files changed, 4 insertions(+), 10 deletions(-)
rename conf/{manager.conf.in => manager.conf} (95%)
diff --git a/conf/Makefile.am b/conf/Makefile.am
index 98fee8b..c8674f5 100644
--- a/conf/Makefile.am
+++ b/conf/Makefile.am
@@ -1,16 +1,12 @@
+appsqldir = $(pkgdatadir)/sql
+
noinst_DATA = manager.conf
-sql_DATA = manager.sql
+appsql_DATA = manager.sql
CLEANFILES = $(noinst_DATA)
-EXTRA_DIST = manager.conf.in $(sql_DATA)
-
-manager.conf: Makefile manager.conf.in
- sed \
- -e 's|[@]templatesdir[@]|$(templatesdir)|' \
- -e 's|[@]confdir[@]|$(confdir)|' \
- < $(srcdir)/$@.in > $@
+EXTRA_DIST = $(noinst_DATA) $(appsql_DATA)
install-data-local:
$(mkinstalldirs) $(DESTDIR)$(confdir)
diff --git a/conf/manager.conf.in b/conf/manager.conf
similarity index 95%
rename from conf/manager.conf.in
rename to conf/manager.conf
index a4195ab..292af27 100644
--- a/conf/manager.conf.in
+++ b/conf/manager.conf
@@ -5,8 +5,6 @@ url = https://access-check.my.fqdn
login_url = https://access-check.my.fqdn/Shibboleth.sso/Login
[setup]
-# base templates directory
-templates_dir = @templatesdir@
# templates theme
templates_theme = edugain
accounts_file = /var/lib/access-check/accounts.php
--
GitLab