diff --git a/conf/Makefile.am b/conf/Makefile.am index 98fee8baef1614cd646a5eca224c15b3fb26e0d9..c8674f5c672a2157080a79043f3b07f24907eb38 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 a4195ab9ccf3c526e4881052fc43272d790be800..292af27c1ac78fc74bd445a11d9b0467c7ca8e23 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