1 files changed, 17 insertions, 15 deletions
diff --git a/pkgs/servers/http/apache-httpd/builder.sh b/pkgs/servers/http/apache-httpd/builder.sh
index 559c75d0124f0..6333dfab578b6 100755
--- a/pkgs/servers/http/apache-httpd/builder.sh
+++ b/pkgs/servers/http/apache-httpd/builder.sh
@@ -1,23 +1,25 @@
-#! /bin/sh
+#! /bin/sh -e
 
-buildinputs="$openssl $db4 $expat $perl"
-. $stdenv/setup || exit 1
+buildInputs="$openssl $db4 $expat $perl"
+. $stdenv/setup
+
+configureFlags="--with-expat=$expat --enable-mods-shared=all --without-gdbm \
+ --enable-threads --with-devrandom=/dev/urandom"
 
 if test $db4Support; then
-    extraflags="--with-berkeley-db=$db4 $extraflags"
+    configureFlags="--with-berkeley-db=$db4 $configureFlags"
 fi
 
 if test $sslSupport; then
-    extraflags="--enable-ssl --with-ssl=$openssl $extraflags"
+    configureFlags="--enable-ssl --with-ssl=$openssl $configureFlags"
 fi
 
-tar xvfz $src || exit 1
-cd httpd-* || exit 1
-./configure --prefix=$out \
- --with-expat=$expat --enable-mods-shared=all --without-gdbm \
- --enable-threads --with-devrandom=/dev/urandom \
- $extraflags || exit 1
-make || exit 1
-make install || exit 1
-strip -S $out/lib/*.a || exit 1
-rm -rf $out/manual || exit 1
+
+postInstall() {
+    echo "removing manual"
+    rm -rf $out/manual
+}
+postInstall=postInstall
+
+
+genericBuild