r477 - x86/trunk/packages/firefox

jhuntwork at linuxfromscratch.org jhuntwork at linuxfromscratch.org
Mon Aug 1 19:03:13 PDT 2005


Author: jhuntwork
Date: 2005-08-01 20:03:12 -0600 (Mon, 01 Aug 2005)
New Revision: 477

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

Modified: x86/trunk/packages/firefox/Makefile
===================================================================
--- x86/trunk/packages/firefox/Makefile	2005-08-02 00:34:47 UTC (rev 476)
+++ x86/trunk/packages/firefox/Makefile	2005-08-02 02:03:12 UTC (rev 477)
@@ -1,30 +1,58 @@
 # Firefox Makefile
+#==============================================================================
 
-# Package versions
 NM= firefox
-VRS= 1.0.4
+VRS= 1.0.6
 DIR= mozilla
+
 FILE= $(NM)-$(VRS)-source.tar.bz2
-URL= http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/$(VRS)/source/$(FILE)
+URL-$(FILE)= $(HTTPBLFS)/F-H/$(FILE)
+SHA-$(FILE)= 56183aa14a0185a27a6ab4337d2ade7d1d45c2a6
 
-#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/firefox ] ; then unpack $(FILE) && cd $(DIR) && \
-	 sed 's!@TOPSRCDIR@!$(ROOT)/$(PKG)/$(NM)/mozilla!' ../.mozconfig > .mozconfig && \
-	 make -f client.mk build && make -f client.mk install && \
-	 cd $(ROOT)/$(PKG)/$(NM) && \
-	 cp -ra $(ROOT)/root/.mozilla /root ; fi
-	@make clean
+stage2: Makefile $(FILE)
+	@$(std_build)
 
+compile-stage2:
+	@$(call echo_message, Configuring)
+#==============================================================================
+# Configure commands below \/
+#==============================================================================
+	@sed 's:@TOPSRCDIR@:$(ROOT)/$(PKG)/$(NM)/mozilla:' ../.mozconfig \
+	 > .mozconfig
+#
+#==Status Messages==========================================
+#
+	@$(OK)
+	@$(call echo_message, Making)
+#==============================================================================
+# Make commands below \/
+#==============================================================================
+	@make -f client.mk build >../$(DIR)-$@.log 2>&1
+#
+#==Status Messages===========================================
+#
+	@$(OK)
+	@$(call echo_message, Installing)
+#==============================================================================
+# Install commands below \/
+#==============================================================================
+	@make -f client.mk install >>../$(DIR)-$@.log 2>&1
+	@cd $(ROOT)/$(PKG)/$(NM) ; cp -ra $(ROOT)/root/.mozilla /root
+#
+#==Status Messages===========================================
+#
+	@$(OK)
+
 clean:
 	@-rm -rf $(DIR)
+
+.PHONY: clean chroot compile-stage2




More information about the livecd mailing list