Changeset 21887

Show
Ignore:
Timestamp:
15.04.2010 19:41:29 (10 years ago)
Author:
ak19
Message:

Occurrences of the placeholder APACHE_HOME_OS were not getting replaced in SOME files on Linux and Mac, but were getting replaced in other files. This inconsistency only occurs when the releasekit runs 'make apache-for-dist', whereas the svn checkout contains all the replacements. The only difference in pattern matching that I can detect is embedding quotes. Committing to try this.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/runtime-src/packages/Makefile.in

    r20894 r21887  
    169169      pre="$$gsdldir/apache-httpd/$(GSDLOS)" ; \ 
    170170      for one_file in apachectl envvars envvars-std; do \ 
    171         sed -e "s%$$pre%*\*\APACHE_HOME_OS\*\*%" $$pre/bin/$$one_file > $$pre/bin/$$one_file.tmp ; \ 
    172         mv $$pre/bin/$$one_file.tmp $$pre/bin/$$one_file ; \ 
     171        sed -e "s%$$pre%*\*\APACHE_HOME_OS\*\*%" "$$pre/bin/$$one_file" > "$$pre/bin/$$one_file.tmp" ; \ 
     172        mv "$$pre/bin/$$one_file.tmp" "$$pre/bin/$$one_file" ; \ 
    173173      done ; \ 
    174174      for one_file in $(REPLACELIST); do \