r518 - in x86/trunk: . packages/links

justin at linuxfromscratch.org justin at linuxfromscratch.org
Tue Aug 2 15:09:39 PDT 2005


Author: justin
Date: 2005-08-02 16:09:38 -0600 (Tue, 02 Aug 2005)
New Revision: 518

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

Modified: x86/trunk/packages/links/Makefile
===================================================================
--- x86/trunk/packages/links/Makefile	2005-08-02 22:07:11 UTC (rev 517)
+++ x86/trunk/packages/links/Makefile	2005-08-02 22:09:38 UTC (rev 518)
@@ -1,29 +1,56 @@
 # Links Makefile
+#==============================================================================
 
-# Package versions
 NM= links
-VRS= 2.1pre15
+VRS= 2.1pre17
 DIR= $(NM)-$(VRS)
+
 FILE= $(DIR).tar.bz2
-URL= ftp://atrey.karlin.mff.cuni.cz/pub/local/clock/links/$(FILE)
+URL-$(FILE)= $(HTTPBLFS)/L/$(FILE)
+SHA-$(FILE)= 2f89de8b8ea797834444f933222ecf7bd2cea84b
 
+# Targets
+# =============================================================================
 
-#RULES
+include $(ROOT)/scripts/functions
 
-.PHONY: clean chroot stage2
-
 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/links ] ; then unpack $(FILE) && cd $(DIR) && \
-	 ./configure --prefix=/usr --enable-graphics && \
-	 make -j3 && make install ; fi
-	@make clean
+stage2: Makefile $(FILE)
+	@$(std_build)
 
+compile-stage2:
+	@$(call echo_message, Configuring)
+#==============================================================================
+# Configure commands below \/
+#==============================================================================
+	@./configure --prefix=/usr --enable-graphics >../$(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
+#
+#==Status Messages===========================================
+#
+	@$(OK)
+
 clean:
 	@-rm -rf $(DIR)
+
+.PHONY: clean chroot compile-stage2

Modified: x86/trunk/todo-list
===================================================================
--- x86/trunk/todo-list	2005-08-02 22:07:11 UTC (rev 517)
+++ x86/trunk/todo-list	2005-08-02 22:09:38 UTC (rev 518)
@@ -3,7 +3,6 @@
 hotplug
 inputattach
 lfs-bootscripts
-links
 lua
 lynx
 msmtp




More information about the livecd mailing list