diff options
Diffstat (limited to 'mail/sympa/files/patch-Makefile.am')
| -rw-r--r-- | mail/sympa/files/patch-Makefile.am | 40 |
1 files changed, 24 insertions, 16 deletions
diff --git a/mail/sympa/files/patch-Makefile.am b/mail/sympa/files/patch-Makefile.am index b2a3ab9696bc..63c403831f4f 100644 --- a/mail/sympa/files/patch-Makefile.am +++ b/mail/sympa/files/patch-Makefile.am @@ -1,22 +1,17 @@ ---- Makefile.am.orig 2017-09-11 13:22:01 UTC +--- Makefile.am.orig 2019-03-20 12:52:07 UTC +++ Makefile.am -@@ -135,7 +135,7 @@ sympa_wizard.pl.inst: $(top_srcdir)/src/ - installconfig: installdir sympa_wizard.pl.inst +@@ -131,19 +131,19 @@ installdir: + + installconfig: installdir @echo "Installing basic configuration ..." - -@export PERL5LIB=$(DESTDIR)$(modulesdir); \ -- if [ ! -f $(DESTDIR)$(confdir)/sympa.conf ]; then \ -+ if [ ! -f $(DESTDIR)$(confdir)/sympa.conf.sample ]; then \ - echo "This looks like your first Sympa installation. The following wizard will assist you to create your first Sympa configuration.";\ - if [ ! -d $(DESTDIR)$(confdir) ]; then \ - $(INSTALL) -d -m 755 $(DESTDIR)$(confdir); \ -@@ -144,17 +144,17 @@ installconfig: installdir sympa_wizard.p - chgrp $(GROUP) $(DESTDIR)$(confdir); \ - $(PERL) sympa_wizard.pl.inst \ - --create sympa.conf \ -- --target $(DESTDIR)$(confdir)/sympa.conf; \ +- -@if [ ! -f $(DESTDIR)$(confdir)/sympa.conf ]; then \ +- echo "installing sympa.conf"; \ +- $(INSTALL) -m 640 sympa.conf $(DESTDIR)$(confdir); \ - chown $(USER) $(DESTDIR)$(confdir)/sympa.conf; \ - chgrp $(GROUP) $(DESTDIR)$(confdir)/sympa.conf; \ -+ --target $(DESTDIR)$(confdir)/sympa.conf.sample; \ ++ -@if [ ! -f $(DESTDIR)$(confdir)/sympa.conf.sample ]; then \ ++ echo "installing sympa.conf.sample"; \ ++ $(INSTALL) -m 640 sympa.conf $(DESTDIR)$(confdir)/sympa.conf.sample; \ + chown $(USER) $(DESTDIR)$(confdir)/sympa.conf.sample; \ + chgrp $(GROUP) $(DESTDIR)$(confdir)/sympa.conf.sample; \ fi @@ -35,4 +30,17 @@ + chgrp $(GROUP) data_structure.version.sample; \ fi -@for dir in create_list_templates custom_actions custom_conditions \ - data_sources families global_task_models list_task_models \ + data_sources families tasks \ +@@ -184,9 +184,9 @@ nextstep: + @echo "#######################################################" + + uninstall-hook: +- cd $(DESTDIR)$(confdir) && rm -f sympa.conf +- cd $(DESTDIR)$(confdir) && rm -f wwsympa.conf +- cd $(DESTDIR)$(sysconfdir) && rm -f data_structure.version ++ cd $(DESTDIR)$(confdir) && rm -f sympa.conf.sample ++ cd $(DESTDIR)$(confdir) && rm -f wwsympa.conf.sample ++ cd $(DESTDIR)$(sysconfdir) && rm -f data_structure.version.sample + cd $(DESTDIR)$(sysconfdir) && rm -f README + + DISTCHECK_CONFIGURE_FLAGS = --enable-fhs --with-perl=$(PERL) |