r558 - in x86/trunk: . packages/psmisc

justin at linuxfromscratch.org justin at linuxfromscratch.org
Mon Aug 8 17:42:26 PDT 2005


Author: justin
Date: 2005-08-08 18:42:26 -0600 (Mon, 08 Aug 2005)
New Revision: 558

Removed:
   x86/trunk/todo-list
Modified:
   x86/trunk/packages/psmisc/Makefile
Log:
Updated psmisc Makefile.                        Hopefully this is the last of these things.

Modified: x86/trunk/packages/psmisc/Makefile
===================================================================
--- x86/trunk/packages/psmisc/Makefile	2005-08-09 00:38:11 UTC (rev 557)
+++ x86/trunk/packages/psmisc/Makefile	2005-08-09 00:42:26 UTC (rev 558)
@@ -1,31 +1,58 @@
 # Psmisc Makefile
+#==============================================================================
 
-# Package versions
 NM= psmisc
 VRS= 21.6
 DIR= $(NM)-$(VRS)
+
 FILE= $(DIR).tar.bz2
-URL= $(HTTP)/$(NM)/$(FILE)
+URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
+SHA-$(FILE)= 787580ec23b09c72676086da715103bb596efa4e
 
-# RULES
+# Targets
+# =============================================================================
 
-.PHONY:  clean stage2 chroot
+include $(ROOT)/scripts/functions
 
 chroot:
-	@chroot "$(MP)" $(chenv-post-bash) 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
+	@chroot "$(MP)" $(chenv-post-bash) \
+	'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
-stage2:
-	@echo ""
-	@echo "=====> Building $(NM) in chroot"
-	@echo ""
-	@if [ ! -f $(SRC)/$(FILE) ] ; then $(WGET) $(URL) && \
-	 mv $(FILE) $(SRC) ; fi
-	@if [ ! -f /bin/killall ] ; then unpack $(SRC)/$(FILE) && cd $(DIR) && \
-	 ./configure --prefix=/usr --exec-prefix="" && \
-	 make -j3 && make install && \
-	 mv /bin/pstree* /usr/bin && ln -sf pstree /usr/bin/pstree.x11 ; fi
-	@make clean
-	 
+stage2: Makefile $(FILE)
+	@$(std_build)
 
+compile-stage2:
+	@$(call echo_message, Configuring)
+#==============================================================================
+# Configure commands below \/
+#==============================================================================
+	@./configure --prefix=/usr --exec-prefix="" >../$(DIR)-$@.log 2>&1
+#
+#==Status Messages==========================================
+#
+	@$(OK)
+	@$(call echo_message, Making)
+#==============================================================================
+# Make commands below \/
+#==============================================================================
+	@make $(PM) >>../$(DIR)-$@.log 2>&1
+#
+#==Status Messages===========================================
+#
+	@$(OK)
+	@$(call echo_message, Installing)
+#==============================================================================
+# Install commands below \/
+#==============================================================================
+	@make install >>../$(DIR)-$@.log 2>&1
+	@mv /bin/pstree* /usr/bin
+	@ln -sf pstree /usr/bin/pstree.x11
+#
+#==Status Messages===========================================
+#
+	@$(OK)
+
 clean:
 	@-rm -rf $(DIR)
+
+.PHONY: clean chroot compile-stage2

Deleted: x86/trunk/todo-list
===================================================================
--- x86/trunk/todo-list	2005-08-09 00:38:11 UTC (rev 557)
+++ x86/trunk/todo-list	2005-08-09 00:42:26 UTC (rev 558)
@@ -1 +0,0 @@
-psmisc




More information about the livecd mailing list