Changeset 21887

Timestamp:

2010-04-15T19:41:29+12:00 (13 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.

File:

• main/trunk/greenstone2/runtime-src/packages/Makefile.in (modified) (1 diff)

main/trunk/greenstone2/runtime-src/packages/Makefile.in

@@ -169 +169 @@
       pre="$$gsdldir/apache-httpd/$(GSDLOS)" ; \
       for one_file in apachectl envvars envvars-std; do \
-        sed -e "s%$$pre%*\*\APACHE_HOME_OS\*\*%" $$pre/bin/$$one_file > $$pre/bin/$$one_file.tmp ; \
-        mv $$pre/bin/$$one_file.tmp $$pre/bin/$$one_file ; \
+        sed -e "s%$$pre%*\*\APACHE_HOME_OS\*\*%" "$$pre/bin/$$one_file" > "$$pre/bin/$$one_file.tmp" ; \
+        mv "$$pre/bin/$$one_file.tmp" "$$pre/bin/$$one_file" ; \
       done ; \
       for one_file in $(REPLACELIST); do \