Commit 0603d0a8 authored by salaun's avatar salaun
Browse files

[reported by J. Marant] WWSBINDIR var in Makefile had desappeared.

Reintroduce it as 'CGIDIR'


git-svn-id: https://subversion.renater.fr/sympa/trunk@1072 05aa8bb8-cd2b-0410-b1d7-8918dfa770ce
parent ff633613
......@@ -73,6 +73,9 @@ INITDIR = @INITDIR@
BINDIR = ${bindir}
SBINDIR = ${sbindir}
CGIDIR = $(SBINDIR)
LIBDIR = ${libdir}
## Spools directory
......@@ -243,7 +246,8 @@ installnls:
installwws:
(cd wwsympa && echo "making in wwsympa..." && \
$(MAKE) SH='${SH}' CC='${CC}' CFLAGS='${CFLAGS}' PERL='${PERL}' \
DIR='${DIR}' BINDIR='${BINDIR}' SBINDIR='${SBINDIR}' LIBDIR='${LIBDIR}' WWSBINDIR='${WWSBINDIR}' MAILERPROGDIR='${MAILERPROGDIR}' \
DIR='${DIR}' BINDIR='${BINDIR}' SBINDIR='${SBINDIR}' LIBDIR='${LIBDIR}' \
CGIDIR='${CGIDIR}' WWSBINDIR='${WWSBINDIR}' MAILERPROGDIR='${MAILERPROGDIR}' \
PIDDIR='${PIDDIR}' CONFIG='${CONFIG}' WWSCONFIG='${WWSCONFIG}' ETCBINDIR='${ETCBINDIR}' \
DESTDIR='${DESTDIR}' USER='${USER}' GROUP='${GROUP}' ICONSDIR='${ICONSDIR}' newinstall) || exit 1;
......
......@@ -122,6 +122,9 @@ INITDIR = @INITDIR@
BINDIR = ${bindir}
SBINDIR = ${sbindir}
CGIDIR = $(SBINDIR)
LIBDIR = ${libdir}
SPOOLDIR = $(DIR)/spool
......@@ -424,7 +427,8 @@ installnls:
installwws:
(cd wwsympa && echo "making in wwsympa..." && \
$(MAKE) SH='${SH}' CC='${CC}' CFLAGS='${CFLAGS}' PERL='${PERL}' \
DIR='${DIR}' BINDIR='${BINDIR}' SBINDIR='${SBINDIR}' LIBDIR='${LIBDIR}' WWSBINDIR='${WWSBINDIR}' MAILERPROGDIR='${MAILERPROGDIR}' \
DIR='${DIR}' BINDIR='${BINDIR}' SBINDIR='${SBINDIR}' LIBDIR='${LIBDIR}' \
CGIDIR='${CGIDIR}' WWSBINDIR='${WWSBINDIR}' MAILERPROGDIR='${MAILERPROGDIR}' \
PIDDIR='${PIDDIR}' CONFIG='${CONFIG}' WWSCONFIG='${WWSCONFIG}' ETCBINDIR='${ETCBINDIR}' \
DESTDIR='${DESTDIR}' USER='${USER}' GROUP='${GROUP}' ICONSDIR='${ICONSDIR}' newinstall) || exit 1;
......
......@@ -19,7 +19,9 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
sbin_SUBST = bounced.pl archived.pl wwsympa.fcgi
sbin_SUBST = bounced.pl archived.pl
cgi_SUBST = wwsympa.fcgi
lib_SUBST = wwslib.pm cookielib.pm bounce-lib.pl Marc.pm
......@@ -33,20 +35,24 @@ clean:
install:
echo "Please use the main Makefile for installing WWSympa."
newinstall: makedir $(sbin_SUBST) $(lib_SUBST) substsbin substlib installtemplates installicons installsrc installmod
newinstall: makedir $(sbin_SUBST) $(cgi_SUBST) $(lib_SUBST) substcgi substsbin substlib installtemplates installicons installsrc installmod
installmod:
@for i in $(SRC) ; do \
chown $(USER) $(DESTDIR)$(ETCBINDIR)/$$i; \
chgrp $(GROUP) $(DESTDIR)$(ETCBINDIR)/$$i; \
done
@for i in wwsympa.fcgi $(sbin_SUBST) ; do \
@for i in $(sbin_SUBST) ; do \
chown $(USER) $(DESTDIR)$(SBINDIR)/$$i; \
chgrp $(GROUP) $(DESTDIR)$(SBINDIR)/$$i; \
done
@for i in $(cgi_SUBST) ; do \
chown $(USER) $(DESTDIR)$(CGIDIR)/$$i; \
chgrp $(GROUP) $(DESTDIR)$(CGIDIR)/$$i; \
done
@echo "Setting SetUID bit on wwsympa.fcgi..."
chmod u+s $(DESTDIR)$(SBINDIR)/wwsympa.fcgi
chmod g+s $(DESTDIR)$(SBINDIR)/wwsympa.fcgi
chmod u+s $(DESTDIR)$(CGIDIR)/wwsympa.fcgi
chmod g+s $(DESTDIR)$(CGIDIR)/wwsympa.fcgi
chmod 755 $(DESTDIR)$(ETCBINDIR)/wws_templates
chmod 755 $(DESTDIR)$(ICONSDIR)
chmod 755 $(DESTDIR)$(LIBDIR)/Marc
......@@ -61,6 +67,10 @@ makedir:
echo "Creating required directory $(DESTDIR)$(SBINDIR)"; \
mkdir -p $(DESTDIR)$(SBINDIR); \
fi
@if [ ! -d $(DESTDIR)$(CGIDIR) ]; then \
echo "Creating required directory $(DESTDIR)$(CGIDIR)"; \
mkdir -p $(DESTDIR)$(CGIDIR); \
fi
@if [ ! -d $(DESTDIR)$(LIBDIR) ]; then \
echo "Creating required directory $(DESTDIR)$(LIBDIR)"; \
mkdir -p $(DESTDIR)$(LIBDIR); \
......@@ -98,6 +108,7 @@ installtemplates:
PERL=$(PERL); export PERL; \
INSTALLDIR=$(ETCBINDIR)/wws_templates; export INSTALLDIR; \
SBINDIR=$(SBINDIR); export SBINDIR; \
CGIDIR=$(CGIDIR); export CGIDIR; \
LIBDIR=$(LIBDIR); export LIBDIR; \
DESTDIR=$(DESTDIR); export DESTDIR; \
ETCBINDIR=$(ETCBINDIR); export ETCBINDIR; \
......@@ -126,6 +137,7 @@ substlib:
UMASK=0644; export UMASK; \
INSTALLDIR=$(LIBDIR); export INSTALLDIR; \
SBINDIR=$(SBINDIR); export SBINDIR; \
CGIDIR=$(CGIDIR); export CGIDIR; \
PIDDIR=$(PIDDIR); export PIDDIR;\
LIBDIR=$(LIBDIR); export LIBDIR; \
DESTDIR=$(DESTDIR); export DESDIR; \
......@@ -144,6 +156,7 @@ substsbin:
UMASK=0755; export UMASK; \
INSTALLDIR=$(SBINDIR); export INSTALLDIR; \
SBINDIR=$(SBINDIR); export SBINDIR; \
CGIDIR=$(CGIDIR); export CGIDIR; \
PIDDIR=$(PIDDIR); export PIDDIR;\
LIBDIR=$(LIBDIR); export LIBDIR; \
DESTDIR=$(DESTDIR); export DESDIR; \
......@@ -155,3 +168,22 @@ substsbin:
$(PERL) ../subst.pl $(sbin_SUBST) \
)
substcgi:
@echo "Doing multiple substitutions while installing CGIs..."
@( \
PERL=$(PERL); export PERL; \
UMASK=0755; export UMASK; \
INSTALLDIR=$(CGIDIR); export INSTALLDIR; \
SBINDIR=$(SBINDIR); export SBINDIR; \
CGIDIR=$(CGIDIR); export CGIDIR; \
PIDDIR=$(PIDDIR); export PIDDIR;\
LIBDIR=$(LIBDIR); export LIBDIR; \
DESTDIR=$(DESTDIR); export DESDIR; \
ETCBINDIR=$(ETCBINDIR); export ETCBINDIR; \
MAILERPROGDIR=$(MAILERPROGDIR); export MAILERPROGDIR; \
ICONSDIR=$(ICONSDIR); export ICONSDIR; \
WWSCONFIG=$(WWSCONFIG); export WWSCONFIG; \
CONFIG=$(CONFIG); export CONFIG; \
$(PERL) ../subst.pl $(cgi_SUBST) \
)
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