From 94324d95b39ff04dd5cf0f4d0eb0c36ce7c6eaf6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sun, 29 Aug 2010 09:58:53 +0000
Subject: [PATCH] Fix to make procps build with gnumake 3.82

svn path=/nixpkgs/branches/stdenv-updates/; revision=23492
---
 pkgs/os-specific/linux/procps/default.nix       |  2 +-
 pkgs/os-specific/linux/procps/gnumake3.82.patch | 13 +++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/os-specific/linux/procps/gnumake3.82.patch

diff --git a/pkgs/os-specific/linux/procps/default.nix b/pkgs/os-specific/linux/procps/default.nix
index 4a74218aa369..9270e4c6c0e1 100644
--- a/pkgs/os-specific/linux/procps/default.nix
+++ b/pkgs/os-specific/linux/procps/default.nix
@@ -7,6 +7,6 @@ stdenv.mkDerivation {
     url = http://procps.sourceforge.net/procps-3.2.8.tar.gz;
     sha256 = "0d8mki0q4yamnkk4533kx8mc0jd879573srxhg6r2fs3lkc6iv8i";
   };
-  patches = [./makefile.patch ./procps-build.patch];
+  patches = [./makefile.patch ./procps-build.patch ./gnumake3.82.patch];
   buildInputs = [ncurses];
 }
diff --git a/pkgs/os-specific/linux/procps/gnumake3.82.patch b/pkgs/os-specific/linux/procps/gnumake3.82.patch
new file mode 100644
index 000000000000..2b1f28d4bce7
--- /dev/null
+++ b/pkgs/os-specific/linux/procps/gnumake3.82.patch
@@ -0,0 +1,13 @@
+diff --git a/Makefile b/Makefile
+index 09fb3ed..59eba16 100644
+--- a/Makefile
++++ b/Makefile
+@@ -174,7 +174,7 @@ INSTALL := $(BINFILES) $(MANFILES)
+ # want this rule first, use := on ALL, and ALL not filled in yet
+ all: do_all
+ 
+--include */module.mk
++-include proc/module.mk ps/module.mk
+ 
+ do_all:    $(ALL)
+