* Pass makeFlags to `make install' as well. This is because quite

often the same flags need to be passed to both `make' and `make
  install'.  Added a variable buildFlags for flags that should only be
  passed to `make'.

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

pkgs/os-specific/linux/libcap/default.nix

@@ -9,7 +9,7 @@ stdenv.mkDerivation {
   
   preBuild = "
     substituteInPlace libcap/Makefile --replace /usr/include ${stdenv.glibc}/include
-    installFlags=\"LIBDIR=$out/lib INCDIR=$out/include SBINDIR=$out/sbin MANDIR=$out/man\"
+    makeFlags=\"LIBDIR=$out/lib INCDIR=$out/include SBINDIR=$out/sbin MANDIR=$out/man\"
   ";
 
   patches = [

pkgs/stdenv/generic/setup-new2.sh

@@ -566,8 +566,10 @@ buildW() {
 
     eval "$preBuild"
     
-    echo "make flags: $makeFlags ${makeFlagsArray[@]}"
-    make $makeFlags "${makeFlagsArray[@]}" || fail
+    echo "make flags: $makeFlags ${makeFlagsArray[@]} $buildFlags ${buildFlagsArray[@]}"
+    make \
+        $makeFlags "${makeFlagsArray[@]}" \
+        $buildFlags "${buildFlagsArray[@]}" || fail
 
     eval "$postBuild"
 }
@@ -638,8 +640,10 @@ installW() {
             if test -z "$installTargets"; then
                 installTargets=install
             fi
-            echo "install flags: $installTargets $installFlags ${installFlagsArray[@]}"
-            make $installTargets $installFlags "${installFlagsArray[@]}" || fail
+            echo "install flags: $installTargets $makeFlags ${makeFlagsArray[@]} $installFlags ${installFlagsArray[@]}"
+            make $installTargets \
+                $makeFlags ${makeFlagsArray[@]} \
+                $installFlags "${installFlagsArray[@]}" || fail
         fi
     else
         eval "$installCommand"