r522 - in x86/trunk: . packages/lynx

justin at linuxfromscratch.org justin at linuxfromscratch.org
Tue Aug 2 15:21:58 PDT 2005


Author: justin
Date: 2005-08-02 16:21:57 -0600 (Tue, 02 Aug 2005)
New Revision: 522

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

Modified: x86/trunk/packages/lynx/Makefile
===================================================================
--- x86/trunk/packages/lynx/Makefile	2005-08-02 22:16:16 UTC (rev 521)
+++ x86/trunk/packages/lynx/Makefile	2005-08-02 22:21:57 UTC (rev 522)
@@ -1,36 +1,62 @@
 # Lynx Makefile
+#==============================================================================
 
-# Package versions
 NM= lynx
 VRS= 2.8.5
 DIR= $(NM)2-8-5
+
 FILE= $(NM)$(VRS).tar.bz2
-URL= http://lynx.isc.org/release/$(FILE)
+URL-$(FILE)= $(HTTPBLFS)/L/$(FILE)
+SHA-$(FILE)=
 
+# Targets
+# =============================================================================
 
+include $(ROOT)/scripts/functions
 
-#RULES
+chroot:
+	@chroot "$(MP)" $(chenv-blfs) \
+	'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
-.PHONY: clean chroot stage2
+stage2: Makefile $(FILE)
+	@$(std_build)
 
-chroot:
-	@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/lynx ] ; then unpack $(FILE) && cd $(DIR) && \
-	 ./configure --prefix=/usr --libdir=/etc --with-zlib --with-bzlib \
+compile-stage2:
+	@$(call echo_message, Configuring)
+#==============================================================================
+# Configure commands below \/
+#==============================================================================
+	@./configure --prefix=/usr --libdir=/etc --with-zlib --with-bzlib \
 	    --enable-nls --with-ssl --enable-charset-choice \
-	    --enable-locale-charset && \
-	 make -j3 && make install && \
-	 sed -i 's/#LOCALE_CHARSET:FALSE/LOCALE_CHARSET:TRUE/' /etc/lynx.cfg && \
-	 make docdir=/usr/share/doc/$(NM)-$(VRS)/lynx_doc helpdir=/usr/share/doc/$(NM)-$(VRS)/lynx_help install-doc && \
-	 make docdir=/usr/share/doc/$(NM)-$(VRS)/lynx_doc helpdir=/usr/share/doc/$(NM)-$(VRS)/lynx_help install-help && \
-	 chgrp -R root /usr/share/doc/$(NM)-$(VRS)/lynx_doc ; fi
-	@make clean
+	    --enable-locale-charset >../$(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
+	@sed -i 's/#LOCALE_CHARSET:FALSE/LOCALE_CHARSET:TRUE/' /etc/lynx.cfg
+	@make docdir=/usr/share/doc/$(NM)-$(VRS)/lynx_doc helpdir=/usr/share/doc/$(NM)-$(VRS)/lynx_help install-doc
+	@make docdir=/usr/share/doc/$(NM)-$(VRS)/lynx_doc helpdir=/usr/share/doc/$(NM)-$(VRS)/lynx_help install-help
+	@chgrp -R root /usr/share/doc/$(NM)-$(VRS)/lynx_doc
+#
+#==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:16:16 UTC (rev 521)
+++ x86/trunk/todo-list	2005-08-02 22:21:57 UTC (rev 522)
@@ -3,7 +3,6 @@
 hotplug
 inputattach
 lfs-bootscripts
-lynx
 msmtp
 mutt
 nano




More information about the livecd mailing list