diff --git a/bin/Makefile.am b/bin/Makefile.am index 7122811458cba2552441b35739e3ee7ec376537b..18bf5d1e57ab52e3367ef5b2d35fcf307a2d74f7 100644 --- a/bin/Makefile.am +++ b/bin/Makefile.am @@ -9,13 +9,13 @@ EXTRA_DIST = access-check-manager.pl.in access-check-manager.cgi.in access-check-manager.pl: Makefile access-check-manager.pl.in sed \ -e 's|[@]modulesdir[@]|$(modulesdir)|' \ - -e 's|[@]sysconfdir[@]|$(sysconfdir)|' \ + -e 's|[@]confdir[@]|$(confdir)|' \ < $(srcdir)/$@.in > $@ chmod +x $@ access-check-manager.cgi: Makefile access-check-manager.cgi.in sed \ -e 's|[@]modulesdir[@]|$(modulesdir)|' \ - -e 's|[@]sysconfdir[@]|$(sysconfdir)|' \ + -e 's|[@]confdir[@]|$(confdir)|' \ < $(srcdir)/$@.in > $@ chmod +x $@ diff --git a/bin/access-check-manager.cgi.in b/bin/access-check-manager.cgi.in index 75c0d217d02ba7daec63fb79e607dc37b7066816..6513a8a87d6c67d018707ae956ce2e0d76b9ee27 100755 --- a/bin/access-check-manager.cgi.in +++ b/bin/access-check-manager.cgi.in @@ -10,7 +10,7 @@ use Config::Tiny; use AccountManager::App; my $configuration_file = - $ENV{ACCOUNTMANAGER_CONFIG} || '@sysconfdir@/manager.conf'; + $ENV{ACCOUNTMANAGER_CONFIG} || '@confdir@/manager.conf'; my $configuration = Config::Tiny->read($configuration_file); my $app = AccountManager::App->new( diff --git a/bin/access-check-manager.pl.in b/bin/access-check-manager.pl.in index c0454938117691f9148f9f48ca56568f796ff7c3..43652a87aab052d07b1181e3cbf7450840ae5a23 100755 --- a/bin/access-check-manager.pl.in +++ b/bin/access-check-manager.pl.in @@ -47,7 +47,7 @@ pod2usage( ) unless $action; my $configuration_file = - $options{configuration} || '@sysconfdir@/manager.conf'; + $options{configuration} || '@confdir@/manager.conf'; my $configuration = Config::Tiny->read($configuration_file); AccountManager::DB->register_db( diff --git a/conf/Makefile.am b/conf/Makefile.am index 4e9b2b657a8019f636a7e95ead2a8949779c22f9..6032406f8c32b2f68b832a788e586bac4d44ce0f 100644 --- a/conf/Makefile.am +++ b/conf/Makefile.am @@ -7,17 +7,17 @@ EXTRA_DIST = manager.conf.in manager.conf: Makefile manager.conf.in sed \ -e 's|[@]templatesdir[@]|$(templatesdir)|' \ - -e 's|[@]sysconfdir[@]|$(sysconfdir)|' \ + -e 's|[@]confdir[@]|$(confdir)|' \ < $(srcdir)/$@.in > $@ chmod +x $@ install-data-local: - $(mkinstalldirs) $(DESTDIR)$(sysconfdir) - if [ -f $(DESTDIR)$(sysconfdir)/manager.conf ]; then \ - $(INSTALL_DATA) manager.conf $(DESTDIR)$(sysconfdir)/manager.conf.new; \ + $(mkinstalldirs) $(DESTDIR)$(confdir) + if [ -f $(DESTDIR)$(confdir)/manager.conf ]; then \ + $(INSTALL_DATA) manager.conf $(DESTDIR)$(confdir)/manager.conf.new; \ else \ - $(INSTALL_DATA) manager.conf $(DESTDIR)$(sysconfdir)/manager.conf; \ + $(INSTALL_DATA) manager.conf $(DESTDIR)$(confdir)/manager.conf; \ fi uninstall-local: - rm -f $(DESTDIR)$(sysconfdir)/manager.conf + rm -f $(DESTDIR)$(confdir)/manager.conf diff --git a/configure.ac b/configure.ac index 787c7d04d3dc3ecb35d517c5e12561870bb4cae4..0108baea595c7d89071bf00fa92eba220e63e9a5 100644 --- a/configure.ac +++ b/configure.ac @@ -3,10 +3,12 @@ AC_INIT([Access Check Manager], 1.0) AM_INIT_AUTOMAKE([foreign]) AC_REQUIRE_AUX_FILE([tap-driver.sh]) +confdir=$sysconfdir/access-check wwwdir=$datadir/access-check/www modulesdir=$datadir/access-check/lib templatesdir=$datadir/access-check/templates +AC_SUBST(confdir) AC_SUBST(wwwdir) AC_SUBST(modulesdir) AC_SUBST(templatesdir)