Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Several errors by "make install" #39

Merged
merged 4 commits into from
Aug 20, 2017
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 30 additions & 26 deletions Makefile.am
Original file line number Diff line number Diff line change
@@ -94,9 +94,9 @@ authorcheck:

install-data-hook: installdir installconfig nextstep importantchanges
if SMTPC
-chown $(USER) $(DESTDIR)$(libexecdir)/sympa_smtpc
-chgrp $(GROUP) $(DESTDIR)$(libexecdir)/sympa_smtpc
-chmod 750 $(DESTDIR)$(libexecdir)/sympa_smtpc
-@chown $(USER) $(DESTDIR)$(bindir)/sympa_smtpc
-@chgrp $(GROUP) $(DESTDIR)$(bindir)/sympa_smtpc
-@chmod 750 $(DESTDIR)$(bindir)/sympa_smtpc
endif

installdir:
@@ -108,17 +108,22 @@ installdir:
fi; \
done
@echo "Creating writable directories"
@for dir in $(expldir) $(spooldir) $(spooldir)/msg $(spooldir)/digest \
$(spooldir)/moderation $(spooldir)/auth \
$(spooldir)/outgoing $(spooldir)/tmp $(spooldir)/task \
$(spooldir)/bulk \
$(bouncedir) $(arcdir) $(piddir) $(staticdir) $(staticdir)/js $(sysconfdir); do \
-@for dir in $(expldir) $(spooldir) $(bouncedir) $(arcdir) $(piddir) \
$(staticdir) $(staticdir)/js $(sysconfdir); do \
if [ ! -d $(DESTDIR)$$dir ] ; then \
echo "Creating $(DESTDIR)$$dir"; \
$(INSTALL) -d -m 755 $(DESTDIR)$$dir; \
fi; \
chown $(USER) $(DESTDIR)$$dir || /bin/true; \
chgrp $(GROUP) $(DESTDIR)$$dir || /bin/true; \
chown $(USER) $(DESTDIR)$$dir; \
chgrp $(GROUP) $(DESTDIR)$$dir; \
done
-@for subdir in automatic bounce msg task tmp; do \
if [ ! -d $(DESTDIR)$(spooldir)/$$subdir ] ; then \
echo "Creating $(DESTDIR)$(spooldir)/$$subdir"; \
$(INSTALL) -d -m 750 $(DESTDIR)$(spooldir)/$$subdir; \
fi; \
chown $(USER) $(DESTDIR)$(spooldir)/$$subdir; \
chgrp $(GROUP) $(DESTDIR)$(spooldir)/$$subdir; \
done

sympa_wizard.pl.inst: $(top_srcdir)/src/sbin/sympa_wizard.pl.in Makefile
@@ -129,38 +134,37 @@ sympa_wizard.pl.inst: $(top_srcdir)/src/sbin/sympa_wizard.pl.in Makefile

installconfig: installdir sympa_wizard.pl.inst
@echo "Installing basic configuration ..."
export PERL5LIB=$(DESTDIR)$(modulesdir); \
-@export PERL5LIB=$(DESTDIR)$(modulesdir); \
if [ ! -f $(DESTDIR)$(confdir)/sympa.conf ]; 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); \
fi; \
chown $(USER) $(DESTDIR)$(confdir) || /bin/true; \
chgrp $(GROUP) $(DESTDIR)$(confdir) || /bin/true; \
chown $(USER) $(DESTDIR)$(confdir); \
chgrp $(GROUP) $(DESTDIR)$(confdir); \
$(PERL) sympa_wizard.pl.inst \
--create sympa.conf \
--target $(DESTDIR)$(confdir)/sympa.conf \
|| /bin/true; \
chown $(USER) $(DESTDIR)$(confdir)/sympa.conf || /bin/true; \
chgrp $(GROUP) $(DESTDIR)$(confdir)/sympa.conf || /bin/true; \
fi; \
if [ ! -f $(DESTDIR)$(sysconfdir)/data_structure.version ]; then \
--target $(DESTDIR)$(confdir)/sympa.conf; \
chown $(USER) $(DESTDIR)$(confdir)/sympa.conf; \
chgrp $(GROUP) $(DESTDIR)$(confdir)/sympa.conf; \
fi
-@if [ ! -f $(DESTDIR)$(sysconfdir)/data_structure.version ]; then \
cd $(DESTDIR)$(sysconfdir); \
echo "# automatically created file" >> data_structure.version; \
echo "# you should not modify it" >> data_structure.version; \
echo $(VERSION) >> data_structure.version; \
chown $(USER) data_structure.version || /bin/true; \
chgrp $(GROUP) data_structure.version || /bin/true; \
chown $(USER) data_structure.version; \
chgrp $(GROUP) data_structure.version; \
fi
@for dir in create_list_templates custom_actions custom_conditions \
-@for dir in create_list_templates custom_actions custom_conditions \
data_sources families global_task_models list_task_models \
mail_tt2 scenari search_filters web_tt2; do \
if [ ! -d $(DESTDIR)$(sysconfdir)/$$dir ] ; then \
echo "Creating $(DESTDIR)$(sysconfdir)/$$dir"; \
$(INSTALL) -d -m 755 $(DESTDIR)$(sysconfdir)/$$dir; \
fi; \
chown $(USER) $(DESTDIR)$(sysconfdir)/$$dir || /bin/true; \
chgrp $(GROUP) $(DESTDIR)$(sysconfdir)/$$dir || /bin/true; \
chown $(USER) $(DESTDIR)$(sysconfdir)/$$dir; \
chgrp $(GROUP) $(DESTDIR)$(sysconfdir)/$$dir; \
done
@if [ ! -e $(DESTDIR)$(sysconfdir)/README ]; then \
echo "Creating $(DESTDIR)$(sysconfdir)/README"; \
@@ -174,7 +178,7 @@ installconfig: installdir sympa_wizard.pl.inst
nextstep:
@echo ""
@echo "** You can find documentation at:"
@echo "** http://www.sympa.org/documentation/manual/sympa-$(VERSION).pdf"
@echo "** http://www.sympa.org/manual/"
@echo ""
@echo "#########################################################"
@echo "# CHECK YOU HAVE ALL THE NEEDED MODULES:"
@@ -192,7 +196,7 @@ nextstep:
@echo "#######################################################"

importantchanges:
if test -f $(top_srcdir)/previous_sympa_version; then \
@if test -f $(top_srcdir)/previous_sympa_version; then \
export PREVIOUS=`$(CAT) $(top_srcdir)/previous_sympa_version`; \
fi; \
$(PERL) $(top_srcdir)/important_changes.pl \
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
@@ -615,7 +615,7 @@ AC_CONFIG_FILES([
])

AC_CONFIG_SUBDIRS([src/smtpc])
SMTPC_CONFIGURE_OPTIONS="--bindir=$libexecdir --program-prefix=sympa_"
SMTPC_CONFIGURE_OPTIONS="--program-prefix=sympa_"
export SMTPC_CONFIGURE_OPTIONS

AC_OUTPUT
Binary file removed doc/sympa.pdf
Binary file not shown.