r489 - x86/trunk/packages/freefont

jhuntwork at linuxfromscratch.org jhuntwork at linuxfromscratch.org
Tue Aug 2 04:20:46 PDT 2005


Author: jhuntwork
Date: 2005-08-02 05:20:46 -0600 (Tue, 02 Aug 2005)
New Revision: 489

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

Modified: x86/trunk/packages/freefont/Makefile
===================================================================
--- x86/trunk/packages/freefont/Makefile	2005-08-02 11:10:39 UTC (rev 488)
+++ x86/trunk/packages/freefont/Makefile	2005-08-02 11:20:46 UTC (rev 489)
@@ -1,29 +1,44 @@
 # FreeFont Makefile
+#==============================================================================
 
-# Package versions
 NM= freefont
 VRS= ttf
 DIR= $(NM)-$(VRS)
 FILE= $(DIR).tar.gz
-URL= http://ftp.gnu.org/savannah/files/freefont/$(FILE)
 LOCATION= /usr/X11R6/lib/X11/fonts/TTF
 
-#RULES
+FILE= $(DIR).tar.gz
+URL-$(FILE)= http://ftp.gnu.org/savannah/files/freefont/$(FILE)
+SHA-$(FILE)= bace5fc544871a646b63f94d4902be0fceca0b3e
 
-.PHONY: clean chroot stage2
+# Targets
+# =============================================================================
 
+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 $(LOCATION)/FreeMono.ttf ] ; then mkdir $(DIR) && cd $(DIR) && \
-	 unpack ../$(FILE) && \
-	 cp sfd/* $(LOCATION) ; fi
+stage2: Makefile $(FILE)
+	@mkdir $(DIR) 
+	@cd $(DIR) ; unpack ../$(FILE)
+	@make -C $(DIR) -f ../Makefile compile-$@
 	@make clean
+	@touch $@
 
+compile-stage2:
+	@$(call echo_message, Installing)
+#==============================================================================
+# Install commands below \/
+#==============================================================================
+	@cp -v sfd/* $(LOCATION) >../$(DIR)-$@.log 2>&1
+#
+#==Status Messages===========================================
+#
+	@$(OK)
+
 clean:
 	@-rm -rf $(DIR)
+
+.PHONY: clean chroot compile-stage2




More information about the livecd mailing list