Commit e63a010f authored by olivier.salaun's avatar olivier.salaun
Browse files

[-bug] fix references to sympa.conf and wwsympa.conf : located in confdir, not in sysconfdir


git-svn-id: https://subversion.renater.fr/sympa/trunk@5874 05aa8bb8-cd2b-0410-b1d7-8918dfa770ce
parent 0d6bedd1
......@@ -53,15 +53,15 @@ installdir:
installconfig:
@echo "Installing basic configuration ..."
export PERL5LIB=$(DESTDIR)$(modulesdir); \
if [ ! -f $(DESTDIR)$(sysconfdir)/sympa.conf ]; then \
if [ ! -f $(DESTDIR)$(confdir)/sympa.conf ]; then \
echo "This looks like your first Sympa installation. The following wizard will assit you to create your first Sympa configuration.";\
$(DESTDIR)$(sbindir)/sympa_wizard.pl \
--create sympa.conf \
--target $(DESTDIR)$(sysconfdir)/sympa.conf \
--target $(DESTDIR)$(confdir)/sympa.conf \
|| /bin/true; \
$(DESTDIR)$(sbindir)/sympa_wizard.pl \
--create wwsympa.conf \
--target $(DESTDIR)$(sysconfdir)/wwsympa.conf \
--target $(DESTDIR)$(confdir)/wwsympa.conf \
|| /bin/true; \
$(DESTDIR)$(sbindir)/sympa_wizard.pl || /bin/true;\
fi
......@@ -98,5 +98,5 @@ importantchanges:
--previous $${previous}
uninstall-hook:
rm -f $(DESTDIR)$(sysconfdir)/sympa.conf
rm -f $(DESTDIR)$(sysconfdir)/wwsympa.conf
rm -f $(DESTDIR)$(confdir)/sympa.conf
rm -f $(DESTDIR)$(confdir)/wwsympa.conf
......@@ -42,7 +42,7 @@ F<--spooldir--/outgoing/> outgoing Sympa directory.
F<--defaultdir--/mhonarc-ressources> mhonarc ressource file
F<--sysconfdir--/wwsympa.conf> WWSympa configuration file.
F<--confdir--/wwsympa.conf> WWSympa configuration file.
F<--piddir--/archived.pid> this file contains the process ID
of F<archived.pl>.
......
......@@ -35,7 +35,7 @@ Run the program in a debug mode.
=head1 FILES
F<--sysconfdir--/wwsympa.conf> WWSympa configuration file.
F<--confdir--/wwsympa.conf> WWSympa configuration file.
F<--libexecdir--/bouncequeue> bounce spooler, referenced from sendmail alias file
......
......@@ -53,6 +53,7 @@ encryption.
./configure \
--prefix=%{_prefix} \
--sysconfdir=%{_sysconfdir} \
--confdir=%{_confdir} \
--localstatedir=%{_localstatedir}
make
......@@ -87,4 +88,4 @@ fi
%{_mandir}/man8/*
%{_datadir}/sympa
%{_datadir}/locale/*/*/*
%config(noreplace) %{_sysconfdir}/sympa.conf
%config(noreplace) %{_confdir}/sympa.conf
......@@ -53,6 +53,7 @@ encryption.
./configure \
--prefix=%{_prefix} \
--sysconfdir=%{_sysconfdir} \
--confdir=%{_confdir} \
--localstatedir=%{_localstatedir}
make
......@@ -87,4 +88,4 @@ fi
%{_mandir}/man8/*
%{_datadir}/sympa
%{_datadir}/locale/*/*/*
%config(noreplace) %{_sysconfdir}/sympa.conf
%config(noreplace) %{_confdir}/sympa.conf
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment