r1246 - trunk/packages/LFS-BOOK

alexander at linuxfromscratch.org alexander at linuxfromscratch.org
Wed Dec 7 01:59:13 PST 2005


Author: alexander
Date: 2005-12-07 02:59:13 -0700 (Wed, 07 Dec 2005)
New Revision: 1246

Modified:
   trunk/packages/LFS-BOOK/Makefile
Log:
Fixed download of the LFS book
Downloaded and rendered the UTF-8 book


Modified: trunk/packages/LFS-BOOK/Makefile
===================================================================
--- trunk/packages/LFS-BOOK/Makefile	2005-12-07 09:44:42 UTC (rev 1245)
+++ trunk/packages/LFS-BOOK/Makefile	2005-12-07 09:59:13 UTC (rev 1246)
@@ -7,12 +7,16 @@
 # Ensure sources match LFS book for "trunk".  Update along with LFS packages.
 ifeq ($(VRS),trunk)
 REV= 7197
-REVPARM= -r $(REVISION)
+REVPARM= -r $(REV)
 endif
 
 URL= svn://svn.linuxfromscratch.org/LFS/$(VRS)/BOOK
 FIREFOX_CONFIG= $(ROOT)/root/.mozilla/firefox/2qwpcv2u.default/prefs.js
 
+PATCH50= lfs_book-r7197-utf8-1.patch
+URL-$(PATCH50)= http://www.linuxfromscratch.org/~alexander/patches/$(PATCH50)
+SHA-$(PATCH50)= d2e25ffee4860d06958bb228c431e13c9e42caf9
+
 # Targets
 
 include $(ROOT)/scripts/functions
@@ -21,9 +25,9 @@
 	chroot "$(MP)" $(chenv-blfs) \
 	'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
-stage2: Makefile
+stage2: Makefile $(PATCH50)
 	@$(call echo_message, Building)
-	@svn co -q $(REVPARM) $(URL) $(NM)
+	@echo svn co -q $(REVPARM) $(URL) $(NM)
 	@cd $(NM) ; make BASEDIR=../$(DIR)
 	cp -av $(DIR) /usr/share
 	@sed -i \
@@ -31,10 +35,12 @@
 	 $(FIREFOX_CONFIG)
 	@sed -i 's at WWW_HOME=\".*\"@WWW_HOME=\"/usr/share/$(DIR)/index.html\"@' \
 	 $(ROOT)/etc/profile
+	@cd $(NM) ; patch -Np0 -i ../$(PATCH50) ; make BASEDIR=../$(DIR)-UTF8
+	cp -av $(DIR)-UTF8 /usr/share
 	@make clean >$(DIR)-$@.log 2>&1
 	@touch $@
 
 clean:
-	-rm -rf $(NM) $(DIR)
+	-rm -rf $(NM) $(DIR) $(DIR)-UTF8
 
 .PHONY: clean chroot compile-stage2




More information about the livecd mailing list