Commit 5ed92bef authored by aumont's avatar aumont
Browse files

Changes: allows defining PIDDIR at 'make install' time

PIDDIR changed to /var/run/sympa for RH and Mandrake


git-svn-id: https://subversion.renater.fr/sympa/trunk@964 05aa8bb8-cd2b-0410-b1d7-8918dfa770ce
parent bf0c9a09
......@@ -227,7 +227,7 @@ installsrc:
$(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}' \
CONFIG='${CONFIG}' WWSCONFIG='${WWSCONFIG}' \
PIDDIR='${PIDDIR}' CONFIG='${CONFIG}' WWSCONFIG='${WWSCONFIG}' \
ETCBINDIR='${ETCBINDIR}' SENDMAIL_ALIASES='${SENDMAIL_ALIASES}' \
USER='${USER}' GROUP='${GROUP}' newinstall) || exit 1;
......@@ -243,7 +243,7 @@ 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}' \
CONFIG='${CONFIG}' WWSCONFIG='${WWSCONFIG}' ETCBINDIR='${ETCBINDIR}' \
PIDDIR='${PIDDIR}' CONFIG='${CONFIG}' WWSCONFIG='${WWSCONFIG}' ETCBINDIR='${ETCBINDIR}' \
DESTDIR='${DESTDIR}' USER='${USER}' GROUP='${GROUP}' ICONSDIR='${ICONSDIR}' newinstall) || exit 1;
installsample:
......@@ -377,6 +377,7 @@ build_rh_rpm: clean
APPGROUP='System Environment/Daemons'; export APPGROUP; \
HOMEDIR='/var/sympa'; export HOMEDIR; \
ICONSDIR='/var/www/icons'; export ICONSDIR; \
PIDDIR='/var/run/sympa'; export PIDDIR; \
VERSION=$(SYMPA_VERSION); export VERSION; \
$(PERL) ../../../subst.pl sympa.spec \
)
......@@ -398,6 +399,7 @@ build_mdk_rpm: clean
ZIPEXT='bz2'; export ZIPEXT; \
APPGROUP='System/Servers'; export APPGROUP; \
HOMEDIR='/var/lib/sympa'; export HOMEDIR; \
PIDDIR='/var/run/sympa'; export PIDDIR; \
ICONSDIR='/var/www/icons'; export ICONSDIR; \
VERSION=$(SYMPA_VERSION); export VERSION; \
$(PERL) ../../../subst.pl sympa.spec \
......
......@@ -72,7 +72,7 @@ my %Default_Conf =
'host' => undef,
'domain' => undef,
'email' => 'sympa',
'pidfile' => '--DIR--/sympa.pid',
'pidfile' => '--PIDDIR--/sympa.pid',
'msgcat' => '--DIR--/nls',
'sort' => 'fr,ca,be,ch,uk,edu,*,com',
'spool' => '--DIR--/spool',
......
......@@ -176,6 +176,7 @@ subst:
UMASK=0755; export UMASK;\
DIR=$(DIR); export DIR;\
DESTDIR=$(DESTDIR); export DESTDIR;\
PIDDIR=$(PIDDIR); export PIDDIR;\
INSTALLDIR=$(SBINDIR); export INSTALLDIR;\
SBINDIR=$(SBINDIR); export SBINDIR;\
LIBDIR=$(LIBDIR); export LIBDIR;\
......@@ -191,6 +192,7 @@ subst:
UMASK=0644; export UMASK;\
DIR=$(DIR); export DIR;\
DESTDIR=$(DESTDIR); export DESTDIR;\
PIDDIR=$(PIDDIR); export PIDDIR;\
INSTALLDIR=$(LIBDIR); export INSTALLDIR;\
SBINDIR=$(SBINDIR); export SBINDIR;\
LIBDIR=$(LIBDIR); export LIBDIR;\
......
......@@ -57,7 +57,7 @@ make sources languages
%install
rm -rf $RPM_BUILD_ROOT
make INITDIR=/etc/rc.d/init.d HOST=MYHOST DIR=%{home_s} EXPL_DIR=%{home_s}/expl PIDDIR=%{home_s} BINDIR=%{home_s}/bin SBINDIR=%{home_s}/sbin LIBDIR=%{home_s}/lib MAILERPROGDIR=/etc/smrsh ETCBINDIR=%{home_s}/bin/etc DESTDIR=$RPM_BUILD_ROOT MANDIR=%{man_dir} ICONSDIR=--ICONSDIR-- install
make INITDIR=/etc/rc.d/init.d HOST=MYHOST DIR=%{home_s} EXPL_DIR=%{home_s}/expl PIDDIR=--PIDDIR-- BINDIR=%{home_s}/bin SBINDIR=%{home_s}/sbin LIBDIR=%{home_s}/lib MAILERPROGDIR=/etc/smrsh ETCBINDIR=%{home_s}/bin/etc DESTDIR=$RPM_BUILD_ROOT MANDIR=%{man_dir} ICONSDIR=--ICONSDIR-- install
## Setting Runlevels
for I in 0 1 2 6; do
......
......@@ -122,6 +122,7 @@ substlib:
UMASK=0644; export UMASK; \
INSTALLDIR=$(LIBDIR); export INSTALLDIR; \
SBINDIR=$(SBINDIR); export SBINDIR; \
PIDDIR=$(PIDDIR); export PIDDIR;\
LIBDIR=$(LIBDIR); export LIBDIR; \
DESTDIR=$(DESTDIR); export DESDIR; \
ETCBINDIR=$(ETCBINDIR); export ETCBINDIR; \
......@@ -139,6 +140,7 @@ substsbin:
UMASK=0755; export UMASK; \
INSTALLDIR=$(SBINDIR); export INSTALLDIR; \
SBINDIR=$(SBINDIR); export SBINDIR; \
PIDDIR=$(PIDDIR); export PIDDIR;\
LIBDIR=$(LIBDIR); export LIBDIR; \
DESTDIR=$(DESTDIR); export DESDIR; \
ETCBINDIR=$(ETCBINDIR); export ETCBINDIR; \
......
......@@ -132,15 +132,15 @@ sub load_config {
## Valid params
my %default_conf = (arc_path => '/home/httpd/html/arc',
archive_default_index => 'thrd',
archived_pidfile => '--DIR--/archived.pid',
archived_pidfile => '--PIDDIR--/archived.pid',
bounce_path => '/var/bounce',
bounced_pidfile => '--DIR--/bounced.pid',
bounced_pidfile => '--PIDDIR--/bounced.pid',
cookie_domain => 'localhost',
cookie_expire => 0,
icons_url => '/icons',
mhonarc => '/usr/bin/mhonarc',
review_page_size => 25,
task_manager_pidfile => '--DIR--/task_manager.pid',
task_manager_pidfile => '--PIDDIR--/task_manager.pid',
title => 'Mailing Lists Service',
use_fast_cgi => 1,
wws_path => '--BINDIR--',
......
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