Changeset 23935 for main/trunk/greenstone2

Timestamp:

2011-04-20T15:35:34+12:00 (13 years ago)

Author:

sjm84

Message:

Change to keep the intermeditae files generated in preparing Apache httpd for installation on another computer in another directory. Usefule for USB versions of Greenstone

File:

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

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

@@ -170 +170 @@
       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.in" ; \
+        cp "$$pre/bin/$$one_file.in" "$$pre/bin/$$one_file" ; \
       done ; \
       for one_file in $(REPLACELIST); do \
-        sed -e "s%$$pre%*\*\APACHE_HOME_OS\*\*%" "$$pre/$$one_file" > "$$pre/$$one_file.tmp" ; \
-        mv "$$pre/$$one_file.tmp" "$$pre/$$one_file" ; \
+        sed -e "s%$$pre%*\*\APACHE_HOME_OS\*\*%" "$$pre/$$one_file" > "$$pre/$$one_file.in" ; \
+        cp "$$pre/$$one_file.in" "$$pre/$$one_file" ; \
       done ; \
       cat "$$pre/bin/apr-1-config" \
         | sed -e "s%^APR_SOURCE_DIR=.*%APR_SOURCE_DIR=%" \
         | sed -e "s%^APR_BUILD_DIR=.*%APR_BUILD_DIR=%" \
-        > "$$pre/bin/apr-1-config.tmp" ; \
-      mv "$$pre/bin/apr-1-config.tmp" "$$pre/bin/apr-1-config" ; \
+        > "$$pre/bin/apr-1-config.in" ; \
+      cp "$$pre/bin/apr-1-config.in" "$$pre/bin/apr-1-config" ; \
       cat "$$pre/bin/apu-1-config" \
         | sed -e "s%^APU_SOURCE_DIR=.*%APU_SOURCE_DIR=%" \
         | sed -e "s%^APU_BUILD_DIR=.*%APU_BUILD_DIR=%" \
-        > "$$pre/bin/apu-1-config.tmp" ; \
-      mv "$$pre/bin/apu-1-config.tmp" "$$pre/bin/apu-1-config" ; \
-      sed -e "s%^EXTRA_INCLUDES\s*=.*%EXTRA_INCLUDES=%" "$$pre/build/config_vars.mk" > "$$pre/build/config_vars.mk.tmp" ; \
-      mv "$$pre/build/config_vars.mk.tmp" "$$pre/build/config_vars.mk" ; )
+        > "$$pre/bin/apu-1-config.in" ; \
+      cp "$$pre/bin/apu-1-config.in" "$$pre/bin/apu-1-config" ; \
+      sed -e "s%^EXTRA_INCLUDES\s*=.*%EXTRA_INCLUDES=%" "$$pre/build/config_vars.mk" > "$$pre/build/config_vars.mk.in" ; \
+      cp "$$pre/build/config_vars.mk.in" "$$pre/build/config_vars.mk" ; )