[procps/f14/master] fixed build with make 3.82

[Jan Görig]

commit 3e1e2d037beeffbcfb8fd640f8672a75d6859e92
Author: Jan Görig <jgorig at redhat.com>
Date:   Wed Sep 8 18:58:23 2010 +0200

    fixed build with make 3.82

 procps-3.2.8-make.patch |   13 +++++++++++++
 procps.spec             |    8 +++++++-
 2 files changed, 20 insertions(+), 1 deletions(-)
---
diff --git a/procps-3.2.8-make.patch b/procps-3.2.8-make.patch
new file mode 100644
index 0000000..9e81546
--- /dev/null
+++ b/procps-3.2.8-make.patch
@@ -0,0 +1,13 @@
+diff -up procps-3.2.8/Makefile.make procps-3.2.8/Makefile
+--- procps-3.2.8/Makefile.make	2010-09-08 18:16:34.000000000 +0200
++++ procps-3.2.8/Makefile	2010-09-08 18:54:41.668727996 +0200
+@@ -174,7 +174,8 @@ 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
++-include ps/module.mk
+ 
+ do_all:    $(ALL)
+ 
diff --git a/procps.spec b/procps.spec
index 16d7da5..c8a6012 100644
--- a/procps.spec
+++ b/procps.spec
@@ -1,7 +1,7 @@
 Summary: System and process monitoring utilities
 Name: procps
 Version: 3.2.8
-Release: 10%{?dist}
+Release: 11%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: Applications/System
 URL: http://procps.sourceforge.net
@@ -94,6 +94,8 @@ Patch47: procps-pmap-smaps.patch
 #Patch48: procps-3.2.7-vmstat-sm.patch
 Patch48: procps-3.2.8-vmstat-getopt.patch
 Patch49: procps-3.2.8-ps-cgroup-suppress-root-group.patch
+#631340 - fixed build with make 3.82
+Patch50: procps-3.2.8-make.patch
 
 BuildRequires: ncurses-devel
 
@@ -164,6 +166,7 @@ working directory of a process or processes.
 %patch47 -p1
 %patch48 -p1
 %patch49 -p1
+%patch50 -p1
 
 cp %SOURCE1 .
 
@@ -201,6 +204,9 @@ rm -rf %{buildroot}
 %attr(0644,root,root) %{_mandir}/man5/*
 
 %changelog
+* Wed Sep 8 2010 Jan Görig <jgorig at redhat.com> 3.2.8-11
+- fixed build with make 3.82
+
 * Tue May 18 2010 Daniel Novotny <dnovotny at redhat.com> 3.2.8-10
 - added patch for cgroup display (supress root group)
   thanks to Lennart Poettering (#593267)