Changeset 19036 for gsdl/trunk/runtime-src/packages/Makefile.in

Timestamp:

2009-04-17T15:50:29+12:00 (15 years ago)

Author:

ak19

Message:

Last remaining occurrences of original compilation pathnames in apache web server files now removed (replaced with placeholder) upon running the target make apache-for-dist, and these are replaced with the installation pathname upon installation. Now there are no tell-tale pathnames when the Installer runs, as these are replaced once again with APACHE_OS_HOME BEFORE the installer gets the files.

File:

• gsdl/trunk/runtime-src/packages/Makefile.in (modified) (2 diffs)

gsdl/trunk/runtime-src/packages/Makefile.in

@@ -72 +72 @@
 PACKAGEDIRS =   $(YAZ) $(D2M) $(CORBA)  $(HTTPD)
 
+REPLACELIST = conf/extra/httpd-dav.conf \
+    conf/extra/httpd-manual.conf \
+    conf/extra/httpd-autoindex.conf \
+    conf/extra/httpd-vhosts.conf \
+    conf/extra/httpd-ssl.conf \
+    conf/extra/httpd-multilang-errordoc.conf \
+    conf/original/extra/httpd-dav.conf \
+    conf/original/extra/httpd-manual.conf \
+    conf/original/extra/httpd-autoindex.conf \
+    conf/original/extra/httpd-vhosts.conf \
+    conf/original/extra/httpd-ssl.conf \
+    conf/original/extra/httpd-multilang-errordoc.conf \
+    conf/original/httpd.conf\
+    lib/apr-util-1/apr_dbd_odbc.la \
+    lib/apr-util-1/apr_dbd_sqlite3.la \
+    lib/pkgconfig/apr-util-1.pc \
+    lib/pkgconfig/apr-1.pc \
+    lib/libaprutil-1.la \
+    lib/libapr-1.la \
+    build/config_vars.mk \
+    build/config.nice \
+    build/apr_rules.mk \
+    bin/apu-1-config \
+    bin/apr-1-config \
+    include/ap_config_auto.h \
+    include/ap_config_layout.h
 
 all:
@@ -133 +159 @@
       chmod 755 ../../apache-httpd/$(GSDLOS)/install-bindist.sh ; \
       gsdldir=`cd ../.. ; pwd` ; \
+      pre="$$gsdldir/apache-httpd/$(GSDLOS)" ; \
       for one_file in apachectl envvars envvars-std; do \
-        sed -e "s%$$gsdldir/apache-httpd/$(GSDLOS)%*\*\APACHE_HOME_OS\*\*%" ../../apache-httpd/$(GSDLOS)/bin/$$one_file > ../../apache-httpd/$(GSDLOS)/bin/$$one_file.tmp ; \
-        mv ../../apache-httpd/$(GSDLOS)/bin/$$one_file.tmp ../../apache-httpd/$(GSDLOS)/bin/$$one_file ; \
-      done ; )
+        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 \
+        sed -e "s%$$pre%*\*\APACHE_HOME_OS\*\*%" "$$pre/$$one_file" > "$$pre/$$one_file.tmp" ; \
+        mv "$$pre/$$one_file.tmp" "$$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" ; \
+      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" ; )