Commit 220ffdb0 authored by salaun's avatar salaun
Browse files

[Didier Lamballais] Change: add NEWALIASES_ARG var to Makefile


git-svn-id: https://subversion.renater.fr/sympa/trunk@561 05aa8bb8-cd2b-0410-b1d7-8918dfa770ce
parent c2b86187
......@@ -68,6 +68,9 @@ ICONSDIR = /home/httpd/icons
## Mail aliases database)
NEWALIASES = /usr/bin/newaliases
## Argument to newaliases command
# NEWALIASES_ARG = hash:/etc/mail/sympa_aliases
## The sendmail aliases file we use. Better use a seperate one for sympa.
## Of cause a extra alias file must be generated with proper permissions
## (owner sympa, write access for sympa, no write access for anyone else)
......@@ -123,7 +126,7 @@ checkperl:
echo "#############################################################################"; \
fi
sources: src/Makefile src/queue.c src/bouncequeue.c
sources: src/Makefile src/queue.c src/bouncequeue.c src/aliaswrapper.c
@echo "Making src"
(cd src && echo "making in src..." && \
$(MAKE) SH='${SH}' CC='${CC}' CFLAGS='${CFLAGS}' PERL='${PERL}' \
......@@ -131,7 +134,8 @@ sources: src/Makefile src/queue.c src/bouncequeue.c
MAILERPROGDIR='${MAILERPROGDIR}' ETCBINDIR='${ETCBINDIR}' \
CONFIG='${CONFIG}' WWSCONFIG='${WWSCONFIG}' \
USER='${USER}' GROUP='${GROUP}' \
SENDMAIL_ALIASES='${SENDMAIL_ALIASES}' NEWALIASES='${NEWALIASES}');
SENDMAIL_ALIASES='${SENDMAIL_ALIASES}' NEWALIASES='${NEWALIASES}' \
NEWALIASES_ARG='${NEWALIASES_ARG}');
doc: doc/sympa.tex.tpl doc/Makefile
@echo "Making doc"
......
......@@ -839,6 +839,7 @@ the case if you are using redhat 6.X.
\item SENDMAIL\_ALIASES, the sendmail aliases file. This is used by the alias\_manager
script.
\item NEWALIASES, the path to newaliases command.
\item NEWALIASES\_ARG, arguments passed to newaliases command.
\item INITDIR, the directory to contain a SYSV init script (typically /etc.rc.d/init.d/)
\item DESTDIR, can be set in the main Makefile to install sympa in DESTDIR/DIR
(instead of DIR). This is useful for building RPM and DEB packages.
......
......@@ -112,7 +112,7 @@ bouncequeue: bouncequeue.c Makefile ../Makefile
aliaswrapper: aliaswrapper.c Makefile ../Makefile
$(CC) $(CFLAGS) $(CDEFS) -DNEWALIASES=\"${NEWALIASES}\" \
-o aliaswrapper aliaswrapper.c
-DNEWALIASES_ARG=\"${NEWALIASES_ARG}\" -o aliaswrapper aliaswrapper.c
subst:
@echo "Doing multiple substitutions while installing ..."
......
......@@ -5,7 +5,7 @@
int main(int argc, char *argv[])
{
setuid(0);
execle(NEWALIASES, NEWALIASES, NULL, NULL);
perror("Exec of "NEWALIASES" failed!");
execle(NEWALIASES, NEWALIASES, NEWALIASES_ARG, NULL);
perror("Exec of "NEWALIASES NEWALIASES_ARG" failed!");
exit(1);
}
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