Commit 4ff13b83 authored by salaun's avatar salaun
Browse files

Fix: do not install scripts and and aliaswrapper in bindir (install them in sbindir

and libexecdir instead)


git-svn-id: https://subversion.renater.fr/sympa/trunk@1473 05aa8bb8-cd2b-0410-b1d7-8918dfa770ce
parent 851d3785
......@@ -237,7 +237,7 @@ installsrc:
@(cd src && echo "making in src..." && \
$(MAKE) SH='${SH}' CC='${CC}' CFLAGS='${CFLAGS}' PERL='${PERL}' SYMPA_VERSION='${SYMPA_VERSION}' \
DIR='${DIR}' BINDIR='${BINDIR}' SBINDIR='${SBINDIR}' LIBDIR='${LIBDIR}' WWSBINDIR='${WWSBINDIR}' \
DESTDIR='${DESTDIR}' MAILERPROGDIR='${MAILERPROGDIR}' EXPL_DIR='${EXPL_DIR}' \
DESTDIR='${DESTDIR}' MAILERPROGDIR='${MAILERPROGDIR}' EXPL_DIR='${EXPL_DIR}' LIBEXECDIR='${LIBEXECDIR}' \
PIDDIR='${PIDDIR}' CONFIG='${CONFIG}' WWSCONFIG='${WWSCONFIG}' \
ETCBINDIR='${ETCBINDIR}' SENDMAIL_ALIASES='${SENDMAIL_ALIASES}' \
VIRTUAL_ALIASES='${VIRTUAL_ALIASES}' HOST='${HOST}' COOKIE='${COOKIE}' \
......
......@@ -101,15 +101,19 @@ installqueue:
installwrapper:
@echo "Installing AliasWrapper binary..."
cp aliaswrapper $(DESTDIR)$(MAILERPROGDIR)/
cp aliaswrapper $(DESTDIR)$(LIBEXECDIR)/
@echo "Installing VirtualWrapper binary..."
cp virtualwrapper $(DESTDIR)$(MAILERPROGDIR)/
cp virtualwrapper $(DESTDIR)$(LIBEXECDIR)/
makedir:
@if [ ! -d $(DESTDIR)$(MAILERPROGDIR) ]; then \
echo "Creating required directory $(DESTDIR)$(MAILERPROGDIR)"; \
mkdir -p $(DESTDIR)$(MAILERPROGDIR); \
fi
@if [ ! -d $(DESTDIR)$(LIBEXECDIR) ]; then \
echo "Creating required directory $(DESTDIR)$(LIBEXECDIR)"; \
mkdir -p $(DESTDIR)$(LIBEXECDIR); \
fi
@if [ ! -d $(DESTDIR)$(BINDIR) ]; then \
echo "Creating required directory $(DESTDIR)$(BINDIR)"; \
mkdir -p $(DESTDIR)$(BINDIR); \
......@@ -153,10 +157,10 @@ installmod:
chgrp -R $(GROUP) $(DESTDIR)$(SBINDIR)
chown -R $(USER) $(DESTDIR)$(LIBDIR)
chgrp -R $(GROUP) $(DESTDIR)$(LIBDIR)
chown root $(DESTDIR)$(MAILERPROGDIR)/aliaswrapper
chgrp $(GROUP) $(DESTDIR)$(MAILERPROGDIR)/aliaswrapper
chown root $(DESTDIR)$(MAILERPROGDIR)/virtualwrapper
chgrp $(GROUP) $(DESTDIR)$(MAILERPROGDIR)/virtualwrapper
chown root $(DESTDIR)$(LIBEXECDIR)/aliaswrapper
chgrp $(GROUP) $(DESTDIR)$(LIBEXECDIR)/aliaswrapper
chown root $(DESTDIR)$(LIBEXECDIR)/virtualwrapper
chgrp $(GROUP) $(DESTDIR)$(LIBEXECDIR)/virtualwrapper
@echo "Setting privileges..."
chmod 755 $(DESTDIR)$(SBINDIR) $(DESTDIR)$(ETCBINDIR)
chmod 755 $(DESTDIR)$(ETCBINDIR)/scenari $(DESTDIR)$(ETCBINDIR)/templates $(DESTDIR)$(ETCBINDIR)/list_task_models $(DESTDIR)$(ETCBINDIR)/global_task_models
......@@ -164,8 +168,8 @@ installmod:
chmod 644 $(DESTDIR)$(ETCBINDIR)/*.conf $(DESTDIR)$(ETCBINDIR)/*.crt
chmod 600 $(DESTDIR)$(ETCBINDIR)/ca-bundle.crt
chmod 4755 $(DESTDIR)$(MAILERPROGDIR)/queue $(DESTDIR)$(MAILERPROGDIR)/bouncequeue
chmod 4750 $(DESTDIR)$(MAILERPROGDIR)/aliaswrapper
chmod 4750 $(DESTDIR)$(MAILERPROGDIR)/virtualwrapper
chmod 4750 $(DESTDIR)$(LIBEXECDIR)/aliaswrapper
chmod 4750 $(DESTDIR)$(LIBEXECDIR)/virtualwrapper
queue: queue.c Makefile ../Makefile
$(CC) $(CFLAGS) $(CDEFS) -o queue queue.c
......
......@@ -26,7 +26,7 @@ SUBSTSRC = load_subscribers.pl arc2webarc.pl testldap.pl p12topem.pl init_commen
INITSRC = sympa
#SCRIPTDIR = ../../../script
SCRIPTDIR = $(BINDIR)
SCRIPTDIR = $(SBINDIR)
all:
......
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