r487 - x86/trunk/packages/fontconfig

jhuntwork at linuxfromscratch.org jhuntwork at linuxfromscratch.org
Tue Aug 2 04:03:31 PDT 2005


Author: jhuntwork
Date: 2005-08-02 05:03:31 -0600 (Tue, 02 Aug 2005)
New Revision: 487

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

Modified: x86/trunk/packages/fontconfig/Makefile
===================================================================
--- x86/trunk/packages/fontconfig/Makefile	2005-08-02 06:55:06 UTC (rev 486)
+++ x86/trunk/packages/fontconfig/Makefile	2005-08-02 11:03:31 UTC (rev 487)
@@ -1,30 +1,58 @@
 # Fontconfig Makefile
+#==============================================================================
 
-# Package versions
 NM= fontconfig
 VRS= 2.3.2
 DIR= $(NM)-$(VRS)
-FILE= $(DIR).tar.gz
-URL= http://fontconfig.org/release/$(FILE)
 
+FILE= $(DIR).tar.bz2
+URL-$(FILE)= $(HTTPBLFS)/F-H/$(FILE)
+SHA-$(FILE)= 4d9eb11ab369b58513b053417f6487b949b1b696
 
-#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 [ ! -d /etc/fonts ] ; then unpack $(FILE) && cd $(DIR) && \
-	 ./configure --prefix=/usr --sysconfdir=/etc --disable-docs && \
-	 make -j3 && make install && \
-	 sed -i -e 's/Bitstream Vera/DejaVu/' /etc/fonts/fonts.conf ; fi
-	@make clean
+stage2: Makefile $(FILE)
+	@$(std_build)
 
+compile-stage2:
+	@$(call echo_message, Configuring)
+#==============================================================================
+# Configure commands below \/
+#==============================================================================
+	@./configure --prefix=/usr --sysconfdir=/etc --disable-docs \
+	 >../$(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 -e 's/Bitstream Vera/DejaVu/' /etc/fonts/fonts.conf
+#
+#==Status Messages===========================================
+#
+	@$(OK)
+
 clean:
 	@-rm -rf $(DIR)
+
+.PHONY: clean chroot compile-stage2




More information about the livecd mailing list