Changeset 23981 for main/trunk/greenstone2/runtime-src/packages/apache-httpd/install-bindist.sh

Timestamp:

2011-05-03T19:09:14+12:00 (13 years ago)

Author:

ak19

Message:

install-bindist.sh now works with template .in files to parallel the changes to the apache-for-dist target in the Makefile compiling apache. Added a file for processing into the Makefile.

File:

• main/trunk/greenstone2/runtime-src/packages/apache-httpd/install-bindist.sh (modified) (3 diffs)

main/trunk/greenstone2/runtime-src/packages/apache-httpd/install-bindist.sh

@@ -78 +78 @@
 #PRE=`grep "^prefix = " build/config_vars.mk`
 #PRE=`echo $PRE | sed -e "s;prefix = ;;"`
-sed -e "s%\*\*APACHE_HOME_OS\*\*%$SR%" build/config_vars.mk > "$SR/build/config_vars.mk.tmp"
+sed -e "s%\*\*APACHE_HOME_OS\*\*%$SR%" build/config_vars.mk.in > "$SR/build/config_vars.mk.tmp"
 mv "$SR/build/config_vars.mk.tmp" "$SR/build/config_vars.mk"
 chmod u+rwx "$SR/build/config_vars.mk"
 
-sed -e "s;^#!/.*;#!$PERL;" bin/dbmmanage > "$SR/bin/dbmmanage.tmp"
+sed -e "s;^#!/.*;#!$PERL;" bin/dbmmanage.in > "$SR/bin/dbmmanage.tmp"
 mv "$SR/bin/dbmmanage.tmp" "$SR/bin/dbmmanage"
 
 # IMPORTANT: need to insert the ServerRoot nested inside quotes into the apachectl file
+#cp bin/apachectl.in bin/apachectl
 sed -e "s%\*\*APACHE_HOME_OS\*\*%\"$SR\"%" \
     -e "s%^HTTPD=.*$%HTTPD=\"$SR/bin/httpd\"%" \
-    -e "s%\$HTTPD%\"\$HTTPD\" -d \"$SR\"%" bin/apachectl > "$SR/bin/apachectl.tmp"
+    -e "s%\$HTTPD%\"\$HTTPD\" -d \"$SR\"%" bin/apachectl.in > "$SR/bin/apachectl.tmp"
 mv "$SR/bin/apachectl.tmp" "$SR/bin/apachectl"
 chmod u+rwx "$SR/bin/apachectl"
 
 sed -e "s%\*\*APACHE_HOME_OS\*\*%$SR%" \
-        bin/envvars-std > "$SR/bin/envvars-std.tmp"
+        bin/envvars-std.in > "$SR/bin/envvars-std.tmp"
 mv "$SR/bin/envvars-std.tmp" "$SR/bin/envvars-std"
 chmod u+rwx "$SR/bin/envvars-std"
@@ -99 +100 @@
 if [ $HAD_ENVVARS = no ]
 then
-    cp -p "$SR/bin/envvars-std" "$SR/bin/envvars"
+    cp -p "$SR/bin/envvars-std" "$SR/bin/envvars.in"
 fi
 # Either way, do a find and replace on APACHE_HOME_OS in the envvars file
-sed -e "s%\*\*APACHE_HOME_OS\*\*%$SR%" "$SR/bin/envvars" > "$SR/bin/envvars.tmp"
+sed -e "s%\*\*APACHE_HOME_OS\*\*%$SR%" "$SR/bin/envvars.in" > "$SR/bin/envvars.tmp"
 mv "$SR/bin/envvars.tmp" "$SR/bin/envvars"
 
@@ -112 +113 @@
 for one_file in $REPLACELIST; do
     if [ -f $one_file ]; then
-        sed -e "s%\*\*APACHE_HOME_OS\*\*%$SR%" "$one_file" > "$one_file.tmp"
+        sed -e "s%\*\*APACHE_HOME_OS\*\*%$SR%" "$one_file.in" > "$one_file.tmp"
         mv $one_file.tmp $one_file
         chmod u+w $one_file