Changeset 23935

Show
Ignore:
Timestamp:
20.04.2011 15:35:34 (9 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

Files:
1 modified

Legend:

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

    r22068 r23935  
    170170      pre="$$gsdldir/apache-httpd/$(GSDLOS)" ; \ 
    171171      for one_file in apachectl envvars envvars-std; do \ 
    172         sed -e "s%$$pre%*\*\APACHE_HOME_OS\*\*%" "$$pre/bin/$$one_file" > "$$pre/bin/$$one_file.tmp" ; \ 
    173         mv "$$pre/bin/$$one_file.tmp" "$$pre/bin/$$one_file" ; \ 
     172        sed -e "s%$$pre%*\*\APACHE_HOME_OS\*\*%" "$$pre/bin/$$one_file" > "$$pre/bin/$$one_file.in" ; \ 
     173        cp "$$pre/bin/$$one_file.in" "$$pre/bin/$$one_file" ; \ 
    174174      done ; \ 
    175175      for one_file in $(REPLACELIST); do \ 
    176         sed -e "s%$$pre%*\*\APACHE_HOME_OS\*\*%" "$$pre/$$one_file" > "$$pre/$$one_file.tmp" ; \ 
    177         mv "$$pre/$$one_file.tmp" "$$pre/$$one_file" ; \ 
     176        sed -e "s%$$pre%*\*\APACHE_HOME_OS\*\*%" "$$pre/$$one_file" > "$$pre/$$one_file.in" ; \ 
     177        cp "$$pre/$$one_file.in" "$$pre/$$one_file" ; \ 
    178178      done ; \ 
    179179      cat "$$pre/bin/apr-1-config" \ 
    180180        | sed -e "s%^APR_SOURCE_DIR=.*%APR_SOURCE_DIR=%" \ 
    181181        | sed -e "s%^APR_BUILD_DIR=.*%APR_BUILD_DIR=%" \ 
    182         > "$$pre/bin/apr-1-config.tmp" ; \ 
    183       mv "$$pre/bin/apr-1-config.tmp" "$$pre/bin/apr-1-config" ; \ 
     182        > "$$pre/bin/apr-1-config.in" ; \ 
     183      cp "$$pre/bin/apr-1-config.in" "$$pre/bin/apr-1-config" ; \ 
    184184      cat "$$pre/bin/apu-1-config" \ 
    185185        | sed -e "s%^APU_SOURCE_DIR=.*%APU_SOURCE_DIR=%" \ 
    186186        | sed -e "s%^APU_BUILD_DIR=.*%APU_BUILD_DIR=%" \ 
    187         > "$$pre/bin/apu-1-config.tmp" ; \ 
    188       mv "$$pre/bin/apu-1-config.tmp" "$$pre/bin/apu-1-config" ; \ 
    189       sed -e "s%^EXTRA_INCLUDES\s*=.*%EXTRA_INCLUDES=%" "$$pre/build/config_vars.mk" > "$$pre/build/config_vars.mk.tmp" ; \ 
    190       mv "$$pre/build/config_vars.mk.tmp" "$$pre/build/config_vars.mk" ; ) 
     187        > "$$pre/bin/apu-1-config.in" ; \ 
     188      cp "$$pre/bin/apu-1-config.in" "$$pre/bin/apu-1-config" ; \ 
     189      sed -e "s%^EXTRA_INCLUDES\s*=.*%EXTRA_INCLUDES=%" "$$pre/build/config_vars.mk" > "$$pre/build/config_vars.mk.in" ; \ 
     190      cp "$$pre/build/config_vars.mk.in" "$$pre/build/config_vars.mk" ; )