From d74192ee389df646868c0f659b4392d85c75fb06 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 9 Mar 2004 10:59:55 +0000
Subject: * propagated-build-inputs should now be placed in $out/nix-support.

svn path=/nixpkgs/trunk/; revision=823
---
 pkgs/development/libraries/libpng/builder.sh | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

(limited to 'pkgs/development/libraries/libpng')

diff --git a/pkgs/development/libraries/libpng/builder.sh b/pkgs/development/libraries/libpng/builder.sh
index d601bfa5fbf0..51e7a38a831c 100755
--- a/pkgs/development/libraries/libpng/builder.sh
+++ b/pkgs/development/libraries/libpng/builder.sh
@@ -1,16 +1,17 @@
-#! /bin/sh
+#! /bin/sh -e
 
 buildinputs="$zlib"
-. $stdenv/setup || exit 1
+. $stdenv/setup
 
-tar xvfj $src || exit 1
-cd libpng-* || exit 1
-make -f scripts/makefile.linux || exit 1
-mkdir $out || exit 1
-mkdir $out/bin || exit 1
-mkdir $out/lib || exit 1
-mkdir $out/include || exit 1
-make -f scripts/makefile.linux install prefix=$out || exit 1
-strip -S $out/lib/*.a || exit 1
+tar xvfj $src
+cd libpng-*
+make -f scripts/makefile.linux
+mkdir $out
+mkdir $out/bin
+mkdir $out/lib
+mkdir $out/include
+make -f scripts/makefile.linux install prefix=$out
+strip -S $out/lib/*.a
 
-echo "$zlib" > $out/propagated-build-inputs || exit 1
+mkdir $out/nix-support
+echo "$zlib" > $out/nix-support/propagated-build-inputs
-- 
cgit 1.4.1