Commit e57dff3f authored by salaun's avatar salaun
Browse files

[G. Paressant] Fix: small fixes, samplelist could not be installed


git-svn-id: https://subversion.renater.fr/sympa/trunk@1784 05aa8bb8-cd2b-0410-b1d7-8918dfa770ce
parent 2ecbe595
......@@ -332,25 +332,16 @@ installscript:
installdir:
echo "Setting $(USER) owner of $(DESTDIR)$(DIR)"
chown $(USER) $(DESTDIR)$(DIR)
chgrp $(GROUP) $(DESTDIR)$(DIR)
@if [ ! -f $(DESTDIR)$(CONFDIR)/sympa.conf ] ; then \
echo "First installation : installing directories..."; \
echo "Creating $(DESTDIR)$(DIR)/"; \
mkdir -p $(DESTDIR)$(DIR); \
chmod 755 $(DESTDIR)$(DIR); \
chown $(USER) $(DESTDIR)$(DIR); \
chgrp $(GROUP) $(DESTDIR)$(DIR); \
for dir in $(EXPL_DIR) $(CONFDIR) $(SAMPLEDIR) ; do \
@echo "Creating required directories"
@for dir in $(DIR) $(EXPL_DIR) $(CONFDIR) $(SAMPLEDIR) ; do \
if [ ! -d $(DESTDIR)$$dir ] ; then \
echo "Creating $(DESTDIR)$$dir"; \
mkdir -p $(DESTDIR)$$dir; \
chown $(USER) $(DESTDIR)$$dir; \
chgrp $(GROUP) $(DESTDIR)$$dir; \
chmod 755 $(DESTDIR)$$dir; \
fi \
done \
fi
done
@if [ ! -f $(DESTDIR)$(CONFDIR)/sympa.conf ] ; then \
echo "First installation : installing conf directories..."; \
for dir in create_list_templates templates wws_templates scenari \
......@@ -439,6 +430,7 @@ build_mdk_rpm: clean
SENDMAIL_ALIASES=$(SENDMAIL_ALIASES); export SENDMAIL_ALIASES; \
MAILERPROGDIR=$(MAILERPROGDIR); export MAILERPROGDIR; \
PIDDIR=$(PIDDIR); export PIDDIR; \
INITDIR=$(INITDIR); export INITDIR; \
SPOOLDIR=$(SPOOLDIR); export SPOOLDIR; \
ICONSDIR=$(ICONSDIR); export ICONSDIR; \
BINDIR=$(BINDIR); export BINDIR; \
......
......@@ -65,15 +65,16 @@ installsrc:
done
installsamplelist:
@if [ ! -d $(DESTDIR)$(SAMPLEDIR) ]; then \
@if [ ! -d $(DESTDIR)$(SAMPLEDIR)/sample-list ]; then \
echo "Installing sample list ..."; \
mkdir -p $(DESTDIR)$(SAMPLEDIR); \
mkdir -p $(DESTDIR)$(SAMPLEDIR)/sample-list; \
for f in test/* ; do \
cd test; \
for f in * ; do \
cp $$f $(DESTDIR)$(SAMPLEDIR)/sample-list/; \
chown $(USER) $(DESTDIR)$(SAMPLEDIR)/$$f; \
chgrp $(GROUP) $(DESTDIR)$(SAMPLEDIR)/$$f; \
chown $(USER) $(DESTDIR)$(SAMPLEDIR)/sample-list/$$f; \
chgrp $(GROUP) $(DESTDIR)$(SAMPLEDIR)/sample-list/$$f; \
done; \
cd ..; \
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