Commit 3c4dcbf9 authored by salaun's avatar salaun
Browse files

[BugID 0000019] Fix: EXPLDIR (set by configure --with-expldir) was not used at...

[BugID 0000019] Fix: EXPLDIR (set by configure --with-expldir) was not used at directory creation time


git-svn-id: https://subversion.renater.fr/sympa/trunk@1411 05aa8bb8-cd2b-0410-b1d7-8918dfa770ce
parent fc850641
......@@ -265,7 +265,8 @@ installwws:
installsample:
@(cd src/etc/sample && echo "making in src/etc/sample..." && \
$(MAKE) SH='${SH}' CC='${CC}' CFLAGS='${CFLAGS}' PERL='${PERL}' LOG_SOCKET_TYPE='${LOG_SOCKET_TYPE}' \
DESTDIR='${DESTDIR}' DIR='${DIR}' BINDIR='${BINDIR}' SBINDIR='${SBINDIR}' LIBDIR='${LIBDIR}' WWSBINDIR='${WWSBINDIR}' HOST='${HOST}' \
DESTDIR='${DESTDIR}' DIR='${DIR}' BINDIR='${BINDIR}' SBINDIR='${SBINDIR}' LIBDIR='${LIBDIR}'
EXPL_DIR='${EXPL_DIR}' WWSBINDIR='${WWSBINDIR}' HOST='${HOST}' \
CONFIG='${CONFIG}' WWSCONFIG='${WWSCONFIG}' ETCBINDIR='${ETCBINDIR}' MAILERPROGDIR='${MAILERPROGDIR}' \
COOKIE='${COOKIE}' OPENSSL='@OPENSSL@' SSLCERTDIR='${SSLCERTDIR}' \
SPOOLDIR='${SPOOLDIR}' USER='${USER}' GROUP='${GROUP}' ICONSDIR='${ICONSDIR}' PIDDIR='${PIDDIR}' install) || exit 1;
......@@ -319,12 +320,12 @@ installdir:
chmod 755 $(DESTDIR)$(DIR); \
chown $(USER) $(DESTDIR)$(DIR); \
chgrp $(GROUP) $(DESTDIR)$(DIR); \
for dir in expl etc sample ; do \
if [ ! -d $(DESTDIR)$(DIR)/$$dir ] ; then \
echo "Creating $(DESTDIR)$(DIR)/$$dir"; \
mkdir -p $(DESTDIR)$(DIR)/$$dir; \
chown $(USER) $(DESTDIR)$(DIR)/$$dir; \
chgrp $(GROUP) $(DESTDIR)$(DIR)/$$dir; \
for dir in $(EXPL_DIR) $(DIR)/etc $(DIR)/sample ; do \
if [ ! -d $(DESTDIR)$$dir ] ; then \
echo "Creating $(DESTDIR)$$dir"; \
mkdir -p $(DESTDIR)$$dir; \
chown $(USER) $(DESTDIR)$$dir; \
chgrp $(GROUP) $(DESTDIR)$$dir; \
fi \
done \
fi
......
......@@ -449,7 +449,8 @@ installwws:
installsample:
@(cd src/etc/sample && echo "making in src/etc/sample..." && \
$(MAKE) SH='${SH}' CC='${CC}' CFLAGS='${CFLAGS}' PERL='${PERL}' LOG_SOCKET_TYPE='${LOG_SOCKET_TYPE}' \
DESTDIR='${DESTDIR}' DIR='${DIR}' BINDIR='${BINDIR}' SBINDIR='${SBINDIR}' LIBDIR='${LIBDIR}' WWSBINDIR='${WWSBINDIR}' HOST='${HOST}' \
DESTDIR='${DESTDIR}' DIR='${DIR}' BINDIR='${BINDIR}' SBINDIR='${SBINDIR}' LIBDIR='${LIBDIR}'
EXPL_DIR='${EXPL_DIR}' WWSBINDIR='${WWSBINDIR}' HOST='${HOST}' \
CONFIG='${CONFIG}' WWSCONFIG='${WWSCONFIG}' ETCBINDIR='${ETCBINDIR}' MAILERPROGDIR='${MAILERPROGDIR}' \
COOKIE='${COOKIE}' OPENSSL='@OPENSSL@' SSLCERTDIR='${SSLCERTDIR}' \
SPOOLDIR='${SPOOLDIR}' USER='${USER}' GROUP='${GROUP}' ICONSDIR='${ICONSDIR}' PIDDIR='${PIDDIR}' install) || exit 1;
......@@ -501,12 +502,12 @@ installdir:
chmod 755 $(DESTDIR)$(DIR); \
chown $(USER) $(DESTDIR)$(DIR); \
chgrp $(GROUP) $(DESTDIR)$(DIR); \
for dir in expl etc sample ; do \
if [ ! -d $(DESTDIR)$(DIR)/$$dir ] ; then \
echo "Creating $(DESTDIR)$(DIR)/$$dir"; \
mkdir -p $(DESTDIR)$(DIR)/$$dir; \
chown $(USER) $(DESTDIR)$(DIR)/$$dir; \
chgrp $(GROUP) $(DESTDIR)$(DIR)/$$dir; \
for dir in $(EXPL_DIR) $(DIR)/etc $(DIR)/sample ; do \
if [ ! -d $(DESTDIR)$$dir ] ; then \
echo "Creating $(DESTDIR)$$dir"; \
mkdir -p $(DESTDIR)$$dir; \
chown $(USER) $(DESTDIR)$$dir; \
chgrp $(GROUP) $(DESTDIR)$$dir; \
fi \
done \
fi
......
......@@ -65,13 +65,13 @@ installsrc:
done
installsamplelist:
@if [ ! -d $(DESTDIR)$(DIR)/expl ]; then \
@if [ ! -d $(DESTDIR)$(EXPL_DIR) ]; then \
echo "Installing sample list ..."; \
mkdir -p $(DESTDIR)$(DIR)/expl; \
mkdir -p $(DESTDIR)$(DIR)/expl/test; \
cp test/* $(DESTDIR)$(DIR)/expl/test/; \
chown -R $(USER) $(DESTDIR)$(DIR)/expl; \
chgrp -R $(GROUP) $(DESTDIR)$(DIR)/expl; \
mkdir -p $(DESTDIR)$(EXPL_DIR); \
mkdir -p $(DESTDIR)$(EXPL_DIR)/test; \
cp test/* $(DESTDIR)$(EXPL_DIR)/test/; \
chown -R $(USER) $(DESTDIR)$(EXPL_DIR); \
chgrp -R $(GROUP) $(DESTDIR)$(EXPL_DIR); \
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