[jbossnative-commits] JBoss Native SVN: r1240 - trunk/build/unix.
Author: jfrederic.clere(a)jboss.com
Date: 2007-12-18 06:07:16 -0500 (Tue, 18 Dec 2007)
New Revision: 1240
Modified:
trunk/build/unix/buildbin.rhel-httpd.sh
Log:
Use the build apr for the moment.
Modified: trunk/build/unix/buildbin.rhel-httpd.sh
===================================================================
--- trunk/build/unix/buildbin.rhel-httpd.sh 2007-12-18 10:17:24 UTC (rev 1239)
+++ trunk/build/unix/buildbin.rhel-httpd.sh 2007-12-18 11:07:16 UTC (rev 1240)
@@ -53,8 +53,10 @@
{
mpm=$1; shift
mkdir $mpm
-(cd $mpm
-bash ../configure \
+#(cd $mpm
+(
+bash ./configure \
+ --with-included-apr \
--prefix=${_sysconfdir}/httpd \
--exec-prefix=${_prefix} \
--bindir=${_bindir} \
@@ -124,6 +126,15 @@
exit 1
fi
+# Install it
+RPM_BUILD_ROOT=$output_loc
+#(cd prefork
+make DESTDIR=$RPM_BUILD_ROOT install
+#)
+
+# Clean it before building worker.
+make clean
+
# For the other MPMs, just build httpd and no optional modules
mpmbuild worker --enable-modules=none
if [ $? -ne 0 ]; then
@@ -132,10 +143,7 @@
fi
# Install it
-RPM_BUILD_ROOT=$output_loc
-(cd prefork
-make DESTDIR=$RPM_BUILD_ROOT install
-)
-install -m 755 worker/httpd ${RPM_BUILD_ROOT}/${_sbindir}/httpd.worker
+#install -m 755 worker/httpd ${RPM_BUILD_ROOT}/${_sbindir}/httpd.worker
+install -m 755 httpd ${RPM_BUILD_ROOT}/${_sbindir}/httpd.worker
echo "Done"
exit 0