X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fpsmisc;h=872c8b1554b24afaf98dd69b38b9013d94c1c14b;hp=1aef62edce2f043bdf4bacb6d4b5e28dca1263f7;hb=9b0ff0a0b64dc82a593e08256c2f3a8a76695493;hpb=15679d9f9689003c7a79fc3875307b666e67a04f

diff --git a/lfs/psmisc b/lfs/psmisc
index 1aef62edce..872c8b1554 100644
--- a/lfs/psmisc
+++ b/lfs/psmisc
@@ -18,12 +18,6 @@
 # Makefiles are based on LFSMake, which is                                    #
 # Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
 #                                                                             #
-# Modifications by:                                                           #
-# ??-12-2003 Mark Wormgoor < mark@wormgoor.com>                               #
-#          - Modified Makefile for IPCop build                                #
-#                                                                             #
-# $Id: psmisc,v 1.3.2.3 2005/02/05 15:38:15 gespinasse Exp $
-#                                                                             #
 ###############################################################################
 
 ###############################################################################
@@ -32,11 +26,11 @@
 
 include Config
 
-VER        = 21.4
+VER        = 22.2
 
 THISAPP    = psmisc-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = $(URL_SFNET)/psmisc
+DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
@@ -48,7 +42,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 8449269fdc8ae5d7d494df745e1180d3
+$(DL_FILE)_MD5 = 77737c817a40ef2c160a7194b5b64337
 
 install : $(TARGET)
 
@@ -78,9 +72,10 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls --exec-prefix=/
-	cd $(DIR_APP) && make
+	cd $(DIR_APP) && ./configure --prefix=/usr --exec-prefix="" --disable-nls
+	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
-	ln -sf killall /bin/pidof
+	mv -v /bin/pstree* /usr/bin
+	#ln -sf killall /bin/pidof
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)