r514 - in x86/trunk: . packages/screen

jhuntwork at linuxfromscratch.org jhuntwork at linuxfromscratch.org
Tue Aug 2 14:13:44 PDT 2005


Author: jhuntwork
Date: 2005-08-02 15:13:43 -0600 (Tue, 02 Aug 2005)
New Revision: 514

Modified:
   x86/trunk/packages/screen/Makefile
   x86/trunk/todo-list
Log:
Updated screen Makefile

Modified: x86/trunk/packages/screen/Makefile
===================================================================
--- x86/trunk/packages/screen/Makefile	2005-08-02 21:05:31 UTC (rev 513)
+++ x86/trunk/packages/screen/Makefile	2005-08-02 21:13:43 UTC (rev 514)
@@ -1,29 +1,59 @@
 # Screen Makefile
+#==============================================================================
 
-# Package versions
 NM= screen
 VRS= 4.0.2
 DIR= $(NM)-$(VRS)
-FILE= $(DIR).tar.gz
-URL= http://ftp.gnu.org/gnu/screen/$(FILE)
 
-#RULES
+FILE= $(DIR).tar.bz2
+URL-$(FILE)= $(HTTPBLFS)/Q-S/$(FILE)
+SHA-$(FILE)= 9a96705ad49ca3437e0ae068a3c8db1b55db83ec
 
-.PHONY: clean chroot stage2
+# Targets
+# =============================================================================
 
+include $(ROOT)/scripts/functions
+
 chroot:
-	@chroot "$(MP)" $(chenv-blfs) 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
+	@chroot "$(MP)" $(chenv-blfs) \
+	'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
-stage2:
-	@echo ""
-	@echo "=====> Building $(NM) in chroot"
-	@echo ""
-	@if [ ! -f $(FILE) ] ; then $(WGET) $(URL) ; fi
-	@if [ ! -f /usr/bin/screen ] ; then unpack $(FILE) && cd $(DIR) && \
-	 ./configure --prefix=/usr --with-socket-dir=/var/run/screen --with-sys-screenrc=/etc/screenrc && \
-	 sed -i -e "s@/usr/local/etc/screenrc@/etc/screenrc@" {etc,doc}/* && \
-	 make -j3 && make install && install -m 644 etc/etcscreenrc /etc/screenrc ; fi
-	@make clean
+stage2: Makefile $(FILE)
+	@$(std_build)
 
+compile-stage2:
+	@$(call echo_message, Configuring)
+#==============================================================================
+# Configure commands below \/
+#==============================================================================
+	@./configure --prefix=/usr --with-socket-dir=/var/run/screen \
+	 --with-sys-screenrc=/etc/screenrc >../$(DIR)-$@.log 2>&1
+	@sed -i -e "s@/usr/local/etc/screenrc@/etc/screenrc@" {etc,doc}/*
+#
+#==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
+	@install -m 644 etc/etcscreenrc /etc/screenrc
+#
+#==Status Messages===========================================
+#
+	@$(OK)
+
 clean:
 	@-rm -rf $(DIR)
+
+.PHONY: clean chroot compile-stage2

Modified: x86/trunk/todo-list
===================================================================
--- x86/trunk/todo-list	2005-08-02 21:05:31 UTC (rev 513)
+++ x86/trunk/todo-list	2005-08-02 21:13:43 UTC (rev 514)
@@ -26,5 +26,4 @@
 reiserfsprogs
 rp-pppoe
 samba
-screen
 shadow




More information about the livecd mailing list