From 151016ab8531d576d48c04f9305eb55b1037fff4 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 8 Jul 2003 15:34:10 +0000
Subject: [PATCH] * Build in the current directory, not in the target
 directory. * `id' -> `name'.

svn path=/nixpkgs/trunk/; revision=132
---
 pkgs/aterm/aterm-build.sh         | 5 +----
 pkgs/aterm/aterm.fix              | 2 +-
 pkgs/fetchurl/fetchurl.fix        | 2 +-
 pkgs/pkgconfig/pkgconfig-build.sh | 5 +----
 pkgs/pkgconfig/pkgconfig.fix      | 2 +-
 pkgs/system/system.fix            | 2 +-
 6 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/pkgs/aterm/aterm-build.sh b/pkgs/aterm/aterm-build.sh
index d3c04ca61f8..aeb715795db 100755
--- a/pkgs/aterm/aterm-build.sh
+++ b/pkgs/aterm/aterm-build.sh
@@ -2,12 +2,9 @@
 
 export PATH=/bin:/usr/bin
 
-mkdir $out || exit 1
-cd $out || exit 1
 tar xvfz $src || exit 1
 cd aterm-* || exit 1
 ./configure --prefix=$out || exit 1
 make || exit 1
+mkdir $out || exit 1
 make install || exit 1
-cd $out || exit 1
-rm -rf aterm-* || exit 1
diff --git a/pkgs/aterm/aterm.fix b/pkgs/aterm/aterm.fix
index 5abf5e228a9..08d3398c824 100644
--- a/pkgs/aterm/aterm.fix
+++ b/pkgs/aterm/aterm.fix
@@ -1,5 +1,5 @@
 Package(
-  [ ("id", "aterm-2.0")
+  [ ("name", "aterm-2.0")
   , ("build", Relative("aterm/aterm-build.sh"))
   , ("src", App(IncludeFix("fetchurl/fetchurl.fix"),
       [ ("url", "http://www.cwi.nl/projects/MetaEnv/aterm/aterm-2.0.tar.gz")
diff --git a/pkgs/fetchurl/fetchurl.fix b/pkgs/fetchurl/fetchurl.fix
index b885e4a893a..a3b3d46e10e 100644
--- a/pkgs/fetchurl/fetchurl.fix
+++ b/pkgs/fetchurl/fetchurl.fix
@@ -3,7 +3,7 @@ Function(["url", "hash"],
     [ ("build", Relative("fetchurl/fetchurl.sh"))
     , ("url", Var("url"))
     , ("hash", Var("hash"))
-    , ("id", BaseName(Var("url")))
+    , ("name", BaseName(Var("url")))
     ]
   )
 )
diff --git a/pkgs/pkgconfig/pkgconfig-build.sh b/pkgs/pkgconfig/pkgconfig-build.sh
index 4cbce82670c..29dc8fcf46a 100755
--- a/pkgs/pkgconfig/pkgconfig-build.sh
+++ b/pkgs/pkgconfig/pkgconfig-build.sh
@@ -2,12 +2,9 @@
 
 export PATH=/bin:/usr/bin
 
-mkdir $out || exit 1
-cd $out || exit 1
 tar xvfz $src || exit 1
 cd pkgconfig-* || exit 1
 ./configure --prefix=$out || exit 1
 make || exit 1
+mkdir $out || exit 1
 make install || exit 1
-cd $out || exit 1
-rm -rf pkgconfig-* || exit 1
diff --git a/pkgs/pkgconfig/pkgconfig.fix b/pkgs/pkgconfig/pkgconfig.fix
index 0bcd43971d8..312db4a0e64 100644
--- a/pkgs/pkgconfig/pkgconfig.fix
+++ b/pkgs/pkgconfig/pkgconfig.fix
@@ -1,5 +1,5 @@
 Package(
-  [ ("id", "pkgconfig-0.15.0")
+  [ ("name", "pkgconfig-0.15.0")
   , ("build", Relative("pkgconfig/pkgconfig-build.sh"))
   , ("src", App(IncludeFix("fetchurl/fetchurl.fix"),
       [ ("url", "http://www.freedesktop.org/software/pkgconfig/releases/pkgconfig-0.15.0.tar.gz")
diff --git a/pkgs/system/system.fix b/pkgs/system/system.fix
index 3279c5ba9f8..db40ada11f1 100644
--- a/pkgs/system/system.fix
+++ b/pkgs/system/system.fix
@@ -1,5 +1,5 @@
 Package(
-  [ ("id", "system")
+  [ ("name", "system")
   , ("build", Relative("system/populate-linkdirs.pl"))
 
   , ("actATerm", IncludeFix("aterm/aterm.fix"))