From aa6fd01f1d5ac574cc023c9a81746d222260ca36 Mon Sep 17 00:00:00 2001
From: albert <>
Date: Wed, 19 Mar 2003 01:15:58 +0000
Subject: [PATCH] SKIP

---
 Makefile     | 4 ++--
 NEWS         | 1 +
 proc/ksym.c  | 2 +-
 proc/sig.c   | 2 +-
 proc/sig.h   | 2 +-
 procps.lsm   | 6 +++---
 procps.spec  | 2 +-
 ps/display.c | 2 +-
 ps/parser.c  | 2 +-
 9 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/Makefile b/Makefile
index c588f601..20692877 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 # procps Makefile
-# Albert Cahalan, 2002
+# Albert Cahalan, 2002-2003
 #
 # Recursive make is considered harmful:
 # http://google.com/search?q=%22recursive+make+considered+harmful%22
@@ -133,7 +133,7 @@ $(BINFILES) : all
 $(MANFILES) : all
 	$(install) --mode a=r $(notdir $@) $@
 
-install: $(filter-out $(SKIP),$(INSTALL))
+install: $(filter-out $(SKIP) $(addprefix $(DESTDIR),$(SKIP)),$(INSTALL))
 	cd $(usr/bin) && ($(ln_f) skill snice; $(ln_f) pgrep pkill)
 
 ############ prog.c --> prog.o
diff --git a/NEWS b/NEWS
index dfb08b59..27fcccf3 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,6 @@
 procps-3.1.6 --> procps-3.1.7
 
+Makefile: made SKIP feature easier to use
 watch: --help now explains -t, --no-title    #182246
 ps: warning directs users to the FAQ
 top: batch mode can refresh by fractional seconds
diff --git a/proc/ksym.c b/proc/ksym.c
index 3b156e97..8f3d4920 100644
--- a/proc/ksym.c
+++ b/proc/ksym.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1998-2002 by Albert Cahalan; all rights reserved.
+ * Copyright 1998-2003 by Albert Cahalan; all rights reserved.
  * This file may be used subject to the terms and conditions of the
  * GNU Library General Public License Version 2, or any later version
  * at your option, as published by the Free Software Foundation.
diff --git a/proc/sig.c b/proc/sig.c
index 18e839a9..ea633973 100644
--- a/proc/sig.c
+++ b/proc/sig.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1998-2002 by Albert Cahalan; all rights resered.
+ * Copyright 1998-2003 by Albert Cahalan; all rights resered.
  * This file may be used subject to the terms and conditions of the
  * GNU Library General Public License Version 2, or any later version
  * at your option, as published by the Free Software Foundation.
diff --git a/proc/sig.h b/proc/sig.h
index ccb6c43a..ee850a2a 100644
--- a/proc/sig.h
+++ b/proc/sig.h
@@ -1,7 +1,7 @@
 #ifndef PROC_SIG_H
 #define PROC_SIG_H
 /*
- * Copyright 1998-2002 by Albert Cahalan; all rights resered.
+ * Copyright 1998-2003 by Albert Cahalan; all rights resered.
  * This file may be used subject to the terms and conditions of the
  * GNU Library General Public License Version 2, or any later version
  * at your option, as published by the Free Software Foundation.
diff --git a/procps.lsm b/procps.lsm
index 27896b85..bd43df19 100644
--- a/procps.lsm
+++ b/procps.lsm
@@ -1,15 +1,15 @@
 Begin4
 Title: procps
 Version: 3.1.7
-Entered-date: 2003-3-17
+Entered-date: 2003-3-18
 Description: Linux system utilities
 Keywords: procps /proc libproc sysctl pmap
 	ps uptime tload free w top vmstat watch skill snice kill pgrep pkill
 Author: Albert Cahalan, Michael K. Johnson, Jim Warner, etc.
 Maintained-by: various <procps-feedback@lists.sf.net>
 Primary-site: http://procps.sf.net/
-	238kB procps-3.1.7.tar.gz
+	239kB procps-3.1.7.tar.gz
 Alternate-site: http://www.debian.org/Packages/unstable/base/procps.html
-	238kB procps-3.1.7.tar.gz
+	239kB procps-3.1.7.tar.gz
 Copying-policy: mixed
 End
diff --git a/procps.spec b/procps.spec
index c746b60c..8771ce16 100644
--- a/procps.spec
+++ b/procps.spec
@@ -26,7 +26,7 @@ make SKIP="/bin/kill /usr/share/man/man1/kill.1" CC="gcc $RPM_OPT_FLAGS" LDFLAGS
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make SKIP="/bin/kill /usr/share/man/man1/kill.1" DESTDIR=$RPM_BUILD_ROOT install="install -D" install
+make SKIP="/bin/kill /usr/share/man/man1/kill.1" DESTDIR=$RPM_BUILD_ROOT ldconfig=echo install="install -D" install
 
 %clean
 rm -rf $RPM_BUILD_ROOT
diff --git a/ps/display.c b/ps/display.c
index 226eb403..7ea75d64 100644
--- a/ps/display.c
+++ b/ps/display.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1998-2002 by Albert Cahalan; all rights resered.
+ * Copyright 1998-2003 by Albert Cahalan; all rights resered.
  * This file may be used subject to the terms and conditions of the
  * GNU Library General Public License Version 2, or any later version
  * at your option, as published by the Free Software Foundation.
diff --git a/ps/parser.c b/ps/parser.c
index decdc1d4..331cd084 100644
--- a/ps/parser.c
+++ b/ps/parser.c
@@ -1136,7 +1136,7 @@ try_bsd:
   // about "ps -aux" suddenly changing behavior if a user "x" were
   // added to the system.
   if(!(personality & PER_FORCE_BSD))
-    fprintf(stderr, "Warning: bad '-'? See http://procps.sf.net/faq.html\n");
+    fprintf(stderr, "Warning: bad syntax, perhaps a bogus '-'? See http://procps.sf.net/faq.html\n");
   // Remember: contact albert@users.sf.net or procps-feedback@lists.sf.net
   // if you should feel tempted. Be damn sure you understand all
   // the issues. The same goes for other stuff too, BTW. Please ask.