Login | Register
My pages Projects Community openCollabNet

Discussions > cvs > CVS update: joist/conf Makefile

Project highlights: Architectural Overview

joist
Discussion topic

Back to topic list

CVS update: joist/conf Makefile

Author edk
Full name Ed Korthof
Date 2001-03-28 00:34:59 PST
Message User: edk
  Date: 01/03/28 00:34:59

  Modified: conf Makefile
  Log:
  solaris sh sucks. but is there really any point in keeping these blocks
  of code for "consistency" when in fact they're as likely to mislead as
  anything else? there are no httpd conf files for joist ... solaris sh
  (dumber than a brick) couldn't grok the syntax when the variable was
  empty.
  
  Revision Changes Path
  1.10 +12 -10 joist/conf/Makefile
  
  Index: Makefile
  ====================​====================​====================​=======
  RCS file: /cvs/joist/conf/Makefile,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- Makefile 2000/12/05 07:11:53 1.9
  +++ Makefile 2001/03/28 08:34:59 1.10
  @@ -9,7 +9,7 @@
   
   install:
       @echo 'Installing project configuration files to sandbox'
  - @for f in $(PROPERTIES_CONF_FILES); do \
  + @for f in "$(PROPERTIES_CONF_FILES)"; do \
         echo " $${f}"; \
         if [ -f $(PROPERTIES_CONF_D​IR)/$${f}.orig ]; then\
           echo "Removing old backup $(PROPERTIES_CONF_D​IR)/$${f}.orig"; \
  @@ -23,8 +23,8 @@
       @if [ ! -d $(SERVLETS_CONF_DIR) ] ; then \
             mkdir -p $(SERVLETS_CONF_DIR) ; \
       fi
  - @for f in $(SERVLETS_CONF_FILES); do \
  - echo " $${f}"; \
  + @for f in "$(SERVLETS_CONF_FILES)"; do \
  + echo " servlets conf file : $${f}"; \
         if [ -f $(SERVLETS_CONF_DIR)/$${f}.orig ]; then \
           echo "Removing old backup $(SERVLETS_CONF_DIR​)/$${f}.orig"; \
           rm -f $(SERVLETS_CONF_DIR​)/$${f}.orig; \
  @@ -33,14 +33,16 @@
           mv $(SERVLETS_CONF_DIR)/$${f} $(SERVLETS_CONF_DIR​)/$${f}.orig; \
         fi; \
         cp -f $${f}* $(SERVLETS_CONF_DIR); \
  - done; \
  - for f in $(HTTPD_CONF_FILES); do \
  - echo " $${f}"; \
  - if [ -f $(HTTPD_CONF_DIR)/$${f} ]; then \
  - mv $(HTTPD_CONF_DIR)/$${f} $(HTTPD_CONF_DIR)/$${f}.orig; \
  - fi; \
  - cp -f $${f}* $(HTTPD_CONF_DIR); \
       done; \
  + if [ ! -z "$(HTTPD_CONF_FILES)" ] ; then \
  + for f in "$(HTTPD_CONF_FILES)"; do \
  + echo " httpd conf file : $${f}"; \
  + if [ -f $(HTTPD_CONF_DIR)/$${f} ]; then \
  + mv $(HTTPD_CONF_DIR)/$${f} $(HTTPD_CONF_DIR)/$${f}.orig; \
  + fi; \
  + cp -f $${f}* $(HTTPD_CONF_DIR); \
  + done; \
  + fi; \
       echo 'Installation of project configuration files complete'; \
       unset registry f ; \
       true

« Previous message in topic | 1 of 1 | Next message in topic »

Messages

Show all messages in topic

CVS update: joist/conf Makefile edk Ed Korthof 2001-03-28 00:34:59 PST
Messages per page: