r520 - in x86/trunk: . packages/lua

justin at linuxfromscratch.org justin at linuxfromscratch.org
Tue Aug 2 15:13:52 PDT 2005


Author: justin
Date: 2005-08-02 16:13:51 -0600 (Tue, 02 Aug 2005)
New Revision: 520

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

Modified: x86/trunk/packages/lua/Makefile
===================================================================
--- x86/trunk/packages/lua/Makefile	2005-08-02 22:10:38 UTC (rev 519)
+++ x86/trunk/packages/lua/Makefile	2005-08-02 22:13:51 UTC (rev 520)
@@ -1,28 +1,56 @@
 # lua Makefile
+#==============================================================================
 
-# Package versions
 NM= lua
 VRS= 5.0.2
 DIR= $(NM)-$(VRS)
+
 FILE= $(DIR).tar.gz
-URL= http://www.lua.org/ftp/$(FILE)
+URL-$(FILE)= http://www.lua.org/ftp/$(FILE)
+SHA-$(FILE)= a200cfd20a9a4c7da1206ae45dddf26186a9e0e7
 
-#RULES
+# Targets
+# =============================================================================
 
-.PHONY: clean chroot stage2
+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/lua ] ; then unpack $(FILE) && cd $(DIR) && \
-	 sed -i 's@/usr/local@/usr@' config && \
-	 make -j3 && make install && ldconfig ; fi
-	@make clean
+stage2: Makefile $(FILE)
+	@$(std_build)
 
+compile-stage2:
+	@$(call echo_message, Configuring)
+#==============================================================================
+# Configure commands below \/
+#==============================================================================
+	@sed -i 's@/usr/local@/usr@' config
+#
+#==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:10:38 UTC (rev 519)
+++ x86/trunk/todo-list	2005-08-02 22:13:51 UTC (rev 520)
@@ -3,7 +3,6 @@
 hotplug
 inputattach
 lfs-bootscripts
-lua
 lynx
 msmtp
 mutt




More information about the livecd mailing list