Commit c2f5acba authored by sympa-authors's avatar sympa-authors
Browse files

[reported by S.Amrani] Fix umask while installing man pages ; also reorganized Makefiles


git-svn-id: https://subversion.renater.fr/sympa/trunk@2963 05aa8bb8-cd2b-0410-b1d7-8918dfa770ce
parent c9eb1b62
......@@ -349,31 +349,11 @@ installsample:
installman:
mkdir -p $(DESTDIR)$(MANDIR)
mkdir -p $(DESTDIR)$(MANDIR)/man8
@for manfile in sympa.8 archived.8 bounced.8 alias_manager.8; do \
echo "Installing man file man8/$$manfile..."; \
( \
cd doc/man8 ; \
PERL=$(PERL); export PERL; \
UMASK=0600; export UMASK; \
DIR=$(DIR); export DIR; \
INSTALLDIR=$(MANDIR)/man8; export INSTALLDIR; \
DESTDIR=$(DESTDIR); export DESTDIR; \
SYMPA_VERSION=$(SYMPA_VERSION); export SYMPA_VERSION; \
CONFDIR=$(CONFDIR); export CONFDIR; \
SENDMAIL_ALIASES=$(SENDMAIL_ALIASES); export SENDMAIL_ALIASES; \
VIRTUAL_ALIASES=$(VIRTUAL_ALIASES); export VIRTUAL_ALIASES; \
MAILERPROGDIR=$(MAILERPROGDIR); export MAILERPROGDIR; \
PIDDIR=$(PIDDIR); export PIDDIR; \
SPOOLDIR=$(SPOOLDIR); export SPOOLDIR; \
PIDDIR=$(PIDDIR); export PIDDIR; \
$(PERL) ../../subst.pl $$manfile \
) ;\
chown $(USER) $(DESTDIR)$(MANDIR)/man8/$$manfile; \
chgrp $(GROUP) $(DESTDIR)$(MANDIR)/man8/$$manfile; \
done
@(cd doc/man8 && \
$(MAKE) PERL='${PERL}' DIR='${DIR}' DESTDIR='${DESTDIR}' SYMPA_VERSION='${SYMPA_VERSION}' MANDIR='${MANDIR}' \
CONFDIR='${CONFDIR}' SENDMAIL_ALIASES='${SENDMAIL_ALIASES}' VIRTUAL_ALIASES='${VIRTUAL_ALIASES}' UMASK='${UMASK}' \
MAILERPROGDIR='${MAILERPROGDIR}' PIDDIR='${PIDDIR}' SPOOLDIR='${SPOOLDIR}' PIDDIR='${PIDDIR}' ETCBINDIR='${ETCBINDIR}' \
newinstall) || exit 1;
installscript:
@(cd src/etc/script && echo "making in src/etc/script..." && \
......
......@@ -691,30 +691,11 @@ installsample:
SPOOLDIR='${SPOOLDIR}' USER='${USER}' GROUP='${GROUP}' ICONSDIR='${ICONSDIR}' PIDDIR='${PIDDIR}' install) || exit 1;
installman:
mkdir -p $(DESTDIR)$(MANDIR)
mkdir -p $(DESTDIR)$(MANDIR)/man8
@for manfile in sympa.8 archived.8 bounced.8 alias_manager.8; do \
echo "Installing man file man8/$$manfile..."; \
( \
cd doc/man8 ; \
PERL=$(PERL); export PERL; \
UMASK=0600; export UMASK; \
DIR=$(DIR); export DIR; \
INSTALLDIR=$(MANDIR)/man8; export INSTALLDIR; \
DESTDIR=$(DESTDIR); export DESTDIR; \
SYMPA_VERSION=$(SYMPA_VERSION); export SYMPA_VERSION; \
CONFDIR=$(CONFDIR); export CONFDIR; \
SENDMAIL_ALIASES=$(SENDMAIL_ALIASES); export SENDMAIL_ALIASES; \
VIRTUAL_ALIASES=$(VIRTUAL_ALIASES); export VIRTUAL_ALIASES; \
MAILERPROGDIR=$(MAILERPROGDIR); export MAILERPROGDIR; \
PIDDIR=$(PIDDIR); export PIDDIR; \
SPOOLDIR=$(SPOOLDIR); export SPOOLDIR; \
PIDDIR=$(PIDDIR); export PIDDIR; \
$(PERL) ../../subst.pl $$manfile \
) ;\
chown $(USER) $(DESTDIR)$(MANDIR)/man8/$$manfile; \
chgrp $(GROUP) $(DESTDIR)$(MANDIR)/man8/$$manfile; \
done
@(cd doc/man8 && \
$(MAKE) PERL='${PERL}' DIR='${DIR}' DESTDIR='${DESTDIR}' SYMPA_VERSION='${SYMPA_VERSION}' MANDIR='${MANDIR}' \
CONFDIR='${CONFDIR}' SENDMAIL_ALIASES='${SENDMAIL_ALIASES}' VIRTUAL_ALIASES='${VIRTUAL_ALIASES}' UMASK='${UMASK}' \
MAILERPROGDIR='${MAILERPROGDIR}' PIDDIR='${PIDDIR}' SPOOLDIR='${SPOOLDIR}' PIDDIR='${PIDDIR}' ETCBINDIR='${ETCBINDIR}' \
newinstall) || exit 1;
installscript:
@(cd src/etc/script && echo "making in src/etc/script..." && \
......
......@@ -18,15 +18,37 @@ install:
echo "Please use the main Makefile for installing MAN Page."
newinstall: makedir
@for c in $(MAN8); do \
echo "Installing man pages...$(DESTDIR)$(MANDIR)/$$c"; \
cp $$c $(DESTDIR)$(MANDIR); \
@for manfile in $(MAN8); do \
echo "Installing man pages...$(DESTDIR)$(MANDIR)/man8/$$manfile"; \
( \
PERL=$(PERL); export PERL; \
UMASK=0644; export UMASK; \
DIR=$(DIR); export DIR; \
INSTALLDIR=$(MANDIR)/man8; export INSTALLDIR; \
DESTDIR=$(DESTDIR); export DESTDIR; \
SYMPA_VERSION=$(SYMPA_VERSION); export SYMPA_VERSION; \
CONFDIR=$(CONFDIR); export CONFDIR; \
SENDMAIL_ALIASES=$(SENDMAIL_ALIASES); export SENDMAIL_ALIASES; \
VIRTUAL_ALIASES=$(VIRTUAL_ALIASES); export VIRTUAL_ALIASES; \
MAILERPROGDIR=$(MAILERPROGDIR); export MAILERPROGDIR; \
PIDDIR=$(PIDDIR); export PIDDIR; \
SPOOLDIR=$(SPOOLDIR); export SPOOLDIR; \
PIDDIR=$(PIDDIR); export PIDDIR; \
ETCBINDIR=$(ETCBINDIR); export ETCBINDIR; \
$(PERL) ../../subst.pl $$manfile \
) ;\
chown $(USER) $(DESTDIR)$(MANDIR)/man8/$$manfile; \
chgrp $(GROUP) $(DESTDIR)$(MANDIR)/man8/$$manfile; \
done
makedir:
@if [ ! -d $(DESTDIR)$(MANDIR) ]; then \
echo "Creating required directory $(DESTDIR)$(MANDIR)"; \
mkdir -p $(DESTDIR)$(MANDIR); \
fi
@if [ ! -d $(DESTDIR)$(MANDIR)/man8 ]; then \
echo "Creating required directory $(DESTDIR)$(MANDIR)/man8"; \
mkdir -p $(DESTDIR)$(MANDIR)/man8; \
fi
......
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