Author: jfrederic.clere(a)jboss.com
Date: 2007-12-17 16:45:58 -0500 (Mon, 17 Dec 2007)
New Revision: 1229
Modified:
trunk/build/unix/buildbin.asf-jk.sh
Log:
Arrange the logic to "hack" config_vars.mk
Modified: trunk/build/unix/buildbin.asf-jk.sh
===================================================================
--- trunk/build/unix/buildbin.asf-jk.sh 2007-12-17 19:20:11 UTC (rev 1228)
+++ trunk/build/unix/buildbin.asf-jk.sh 2007-12-17 21:45:58 UTC (rev 1229)
@@ -69,21 +69,29 @@
exp_installbuild=`find $output_loc -type f -name config_vars.mk`
exp_installbuilddir=`dirname $exp_installbuild`
modules_dir=`find $output_loc -type d -name modules`
-sed "/^sbindir = / c\
-sbindir = ${sbindir}" $configdir/config_vars.mk > $$.mk
-sed "/^bindir = / c\
-bindir = ${bindir}" $$.mk > $$.mk2
-sed "/^APR_CONFIG = / c\
-APR_CONFIG = ${APR_CONFIG}" $$.mk2 > $$.mk
-sed "/^APU_CONFIG = / c\
-APU_CONFIG = ${APU_CONFIG}" $$.mk > $$.mk2
-sed "/^LIBTOOL = / c\
-LIBTOOL = ${LIBTOOL}" $$.mk2 > $$.mk
-sed "/^APR_INCLUDEDIR = / c\
-APR_INCLUDEDIR = ${APR_INCLUDEDIR}" $$.mk > $$.mk2
-sed "/^APU_INCLUDEDIR = / c\
-APU_INCLUDEDIR = ${APU_INCLUDEDIR}" $$.mk2 > $$.mk
+#
+# Fill the sed command file.
+echo "/^sbindir = / c\\" > $$.sed
+echo "sbindir = ${sbindir}" >> $$.sed
+echo "/^bindir = / c\\" >> $$.sed
+echo "bindir = ${bindir}" >> $$.sed
+echo "/^APR_CONFIG = / c\\" >> $$.sed
+echo "APR_CONFIG = ${APR_CONFIG}" >> $$.sed
+echo "/^APU_CONFIG = / c\\" >> $$.sed
+echo "APU_CONFIG = ${APU_CONFIG}" >> $$.sed
+echo "/^LIBTOOL = / c\\" >> $$.sed
+echo "LIBTOOL = ${LIBTOOL}" >> $$.sed
+echo "/^APR_INCLUDEDIR = / c\\" >> $$.sed
+echo "APR_INCLUDEDIR = ${APR_INCLUDEDIR}" >> $$.sed
+echo "/^APU_INCLUDEDIR = / c\\" >> $$.sed
+echo "APU_INCLUDEDIR = ${APU_INCLUDEDIR}" >> $$.sed
+echo "/^exp_installbuilddir = / c\\" >> $$.sed
+echo "exp_installbuilddir = ${exp_installbuilddir}/jk" >> $$.sed
+sed -f $$.sed $configdir/config_vars.mk > $configdir/config_vars.mk.jk
+mkdir -p $configdir/jk
+cp $configdir/config_vars.mk.jk $configdir/jk/config_vars.mk
+
echo "$native_sources; ./configure --with-apxs=${apxs}.jk"
./configure --with-apxs=${apxs}.jk
make