SKIP

diff --git a/Makefile b/Makefile
index c588f6017f5c1240cbce80acd392899bfb882280..206928774b984645f018c8715cee168f94198ce9 100644 (file)
--- 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 dfb08b597141a9b37646120fd66f3692cc448fec..27fcccf3cd80f7c8d8dc5735aae0d81fa98dccb6 100644 (file)
--- 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 3b156e97b70a51dd0e3161ff09a65e3b07294a51..8f3d4920164408901dc3816413862ee0b5cceca3 100644 (file)
--- 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 18e839a9f2a920ff51d118cd48e570837216d4a4..ea633973f5bda837d205d3b7afb1aa3f920cb5ee 100644 (file)
--- 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 ccb6c43a2ff9834f94a9c4eec305cb8dee040049..ee850a2a7c8b5f17d04679d4e6b47d555ee70f37 100644 (file)
--- 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 27896b8520ff591a4ba3937b09b0c6ac5b59bb77..bd43df191c78daf15780edcfafe2f3f4fb2ec6f7 100644 (file)
--- 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 c746b60c7deed99ca345fe84695faa53fab84c50..8771ce162d8233ab1d6ee526ed4d85b49d093b68 100644 (file)
--- 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 226eb403e5ef97d584038d8017082f86ee02fac9..7ea75d648224d087887b1e5af8553e1daff5a487 100644 (file)
--- 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 decdc1d4c1ebc32b6074f92fc10aab290fbc8d27..331cd08463d15319de7a9aab1f451dc0b236a427 100644 (file)
--- 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.