* Build in the current directory, not in the target directory.

* `id' -> `name'.

svn path=/nixpkgs/trunk/; revision=132

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

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")

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")))
     ]
   )
 )

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

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")

pkgs/system/system.fix

@@ -1,5 +1,5 @@
 Package(
-  [ ("id", "system")
+  [ ("name", "system")
   , ("build", Relative("system/populate-linkdirs.pl"))
 
   , ("actATerm", IncludeFix("aterm/aterm.fix"))