Changeset 18826

Timestamp:

2009-03-27T19:23:04+13:00 (15 years ago)

Author:

ak19

Message:

1. Rewrote the apache-for-dist target so that it is no longer dependent on being given GSDLHOME (for which source setup.bash would have to have been performed). 2. No longer gets the redundant apxs.in file from the apache-httpd folder, but gets the original one from the httpd-version folder's support folder nested inside apache-httpd, since they are identical. 3. Corrected references to makefile-variable GSDLOS, now uses appropriate round instead of curly brackets that are used for env variables.

File:

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

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

@@ -102 +102 @@
         done
 ifeq ($(USE_APACHE_HTTPD), 1)
-    mkdir -p ../../apache-httpd/${GSDLOS}/conf
-    cp -f apache-httpd/httpd.conf.in ../../apache-httpd/${GSDLOS}/conf/.
+    mkdir -p ../../apache-httpd/$(GSDLOS)/conf
+    cp -f apache-httpd/httpd.conf.in ../../apache-httpd/$(GSDLOS)/conf/.
     mkdir -p ../../etc/logs-gsi
     cp -f ../../lib/java/build.properties.in ../../lib/java/build.properties 
@@ -129 +129 @@
 
 apache-for-dist:
-    cp apache-httpd/apxs.in ${GSDLHOME}/apache-httpd/${GSDLOS}/apxs.in
-    cp apache-httpd/install-bindist.sh ${GSDLHOME}/apache-httpd/${GSDLOS}/install-bindist.sh
-    chmod 755 ${GSDLHOME}/apache-httpd/${GSDLOS}/install-bindist.sh
-    for one_file in apachectl envvars envvars-std; do \
-      sed -e "s%${GSDLHOME}/apache-httpd/${GSDLOS}%*\*\APACHE_HOME_OS\*\*%" ${GSDLHOME}/apache-httpd/${GSDLOS}/bin/$$one_file > ${GSDLHOME}/apache-httpd/${GSDLOS}/bin/$$one_file.tmp ; \
-      mv ${GSDLHOME}/apache-httpd/${GSDLOS}/bin/$$one_file.tmp ${GSDLHOME}/apache-httpd/${GSDLOS}/bin/$$one_file ; \
-    done
+    ( httpddir=`cd ./apache-httpd/httpd* ; pwd` ; \
+      cp $$httpddir/support/apxs.in ../../apache-httpd/$(GSDLOS)/apxs.in ; \
+      cp apache-httpd/install-bindist.sh ../../apache-httpd/$(GSDLOS)/install-bindist.sh ; \
+      chmod 755 ../../apache-httpd/$(GSDLOS)/install-bindist.sh ; \
+      gsdldir=`cd ../.. ; pwd` ; \
+      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 ; )