r402 - x86/trunk/packages/grep

jhuntwork at linuxfromscratch.org jhuntwork at linuxfromscratch.org
Sun Jul 24 08:19:40 PDT 2005


Author: jhuntwork
Date: 2005-07-24 09:19:39 -0600 (Sun, 24 Jul 2005)
New Revision: 402

Modified:
   x86/trunk/packages/grep/Makefile
Log:
Updated grep

Modified: x86/trunk/packages/grep/Makefile
===================================================================
--- x86/trunk/packages/grep/Makefile	2005-07-24 15:15:38 UTC (rev 401)
+++ x86/trunk/packages/grep/Makefile	2005-07-24 15:19:39 UTC (rev 402)
@@ -1,41 +1,90 @@
 # Grep Makefile
+#==============================================================================
 
-# Package versions
 NM= grep
 VRS= 2.5.1a
 DIR= $(NM)-$(VRS)
+
 FILE= $(DIR).tar.bz2
-URL= $(HTTP)/$(NM)/$(FILE)
+URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
+SHA-$(FILE)= 2cd082775d30be463c0ac674a00595eb56fda22e
 
-# RULES
+# Targets
+# =============================================================================
 
-.PHONY: stage1 clean chroot stage2
+include $(ROOT)/scripts/functions
 
-stage1:
-	@echo ""
-	@echo "=====> Building $(NM)"
-	@echo ""
-	@if [ ! -f $(SRC)/$(FILE) ] ; then $(WGET) $(URL) && \
-	 mv $(FILE) $(SRC) ; fi
-	@if [ ! -f $(WD)/bin/grep ] ; then unpack $(SRC)/$(FILE) && cd $(DIR) && \
-	 ./configure --prefix=$(WD) --disable-perl-regexp && \
-	 make -j3 && make install ; fi
-	@make clean
+stage1: $(FILE)
+	@$(std_build) # See the scripts/functions file for functions like this
+	@cp $(SRC)/$(FILE) $(LFSSRC) # Copy LFS-Base packages to safe location
 
+compile-stage1:
+	@$(call echo_message, Configuring)
+#==============================================================================
+# Configure commands below \/
+#==============================================================================
+	@./configure --prefix=$(WD) --disable-perl-regexp \
+	 >../$(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)
+
 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/grep ] ; then unpack $(SRC)/$(FILE) && cd $(DIR) && \
-	 ./configure --prefix=/usr --bindir=/bin && \
-	 make -j3 && make install ; fi
-	@make clean
-	
+stage2: Makefile $(FILE) 
+	@$(std_build)
 
+compile-stage2:
+	@$(call echo_message, Configuring)
+#==============================================================================
+# Configure commands below \/
+#==============================================================================
+	@./configure --prefix=/usr --bindir=/bin >../$(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: compile-stage1 clean chroot compile-stage2




More information about the livecd mailing list