Author: alexander
Date: 2005-11-01 02:57:16 -0700 (Tue, 01 Nov 2005)
New Revision: 1021

Modified:
   branches/dm/Makefile
   branches/dm/etc/profile
   branches/dm/packages/LFS-BOOK/Makefile
   branches/dm/packages/html_tidy/Makefile
   branches/dm/root/.mozilla/firefox/2qwpcv2u.default/prefs.js
Log:
Fixed dependencies in minimal-blfs
Corrected sha1sum for tidy_docs tarball
Modified LFS-BOOK instructions in order to avoid overwriting already-installed 
files
Built packages up to the kernel


Modified: branches/dm/Makefile
===================================================================
--- branches/dm/Makefile        2005-11-01 09:18:07 UTC (rev 1020)
+++ branches/dm/Makefile        2005-11-01 09:57:16 UTC (rev 1021)
@@ -316,9 +316,10 @@
 endif
 
 minimal-blfs: ch-openssl ch-wget ch-reiserfsprogs ch-xfsprogs \
-       ch-lynx ch-libxml2 ch-expat ch-subversion stop-here ch-lfs-bootscripts \
-       ch-docbook-xml ch-libxslt ch-docbook-xsl ch-html_tidy ch-LFS-BOOK \
-       ch-dhcpcd ch-cpio ch-eject ch-nALFS ch-dialog ch-device-mapper \
+       ch-lynx ch-libxml2 ch-expat ch-subversion ch-lfs-bootscripts \
+       ch-curl ch-zip ch-unzip ch-docbook-xml ch-libxslt ch-docbook-xsl \
+       ch-html_tidy ch-LFS-BOOK \
+       ch-dhcpcd ch-cpio ch-eject ch-nALFS ch-dialog ch-device-mapper 
stop-here \
        ch-linux ch-initramfs ch-cdrtools ch-zisofs-tools ch-initramfs \
        ch-syslinux ch-nALFS-profile
 

Modified: branches/dm/etc/profile
===================================================================
--- branches/dm/etc/profile     2005-11-01 09:18:07 UTC (rev 1020)
+++ branches/dm/etc/profile     2005-11-01 09:57:16 UTC (rev 1021)
@@ -8,7 +8,7 @@
 
 PKG_CONFIG_PATH=/usr/X11R6/lib/pkgconfig
 
-WWW_HOME="/usr/share/LFS-BOOK-6.1-HTML/index.html"
+WWW_HOME="/usr/share/LFS-BOOK-trunk-HTML/index.html"
 
 NNTPSERVER=news.linuxfromscratch.org
 

Modified: branches/dm/packages/LFS-BOOK/Makefile
===================================================================
--- branches/dm/packages/LFS-BOOK/Makefile      2005-11-01 09:18:07 UTC (rev 
1020)
+++ branches/dm/packages/LFS-BOOK/Makefile      2005-11-01 09:57:16 UTC (rev 
1021)
@@ -17,8 +17,9 @@
 
 stage2: Makefile
        @$(call echo_message, Building)
-       @svn co -q $(URL) $(DIR)
-       @cd $(DIR) ; make BASEDIR=/usr/share/$(DIR)
+       @svn co -q $(URL) $(NM)
+       @cd $(NM) ; make BASEDIR=../$(DIR)
+       cp -av $(DIR) /usr/share
        @sed -i \
         '[EMAIL PROTECTED]:///[EMAIL 
PROTECTED]:///usr/share/$(DIR)/index.html@' \
         $(FIREFOX_CONFIG)
@@ -28,6 +29,6 @@
        @touch $@
 
 clean:
-       -rm -rf $(DIR)
+       -rm -rf $(NM) $(DIR)
 
 .PHONY: clean chroot compile-stage2

Modified: branches/dm/packages/html_tidy/Makefile
===================================================================
--- branches/dm/packages/html_tidy/Makefile     2005-11-01 09:18:07 UTC (rev 
1020)
+++ branches/dm/packages/html_tidy/Makefile     2005-11-01 09:57:16 UTC (rev 
1021)
@@ -10,7 +10,7 @@
 
 FILE1= $(NM)_docs.tgz
 URL-$(FILE1)= http://tidy.sourceforge.net/docs/$(FILE1)
-SHA-$(FILE1)= b243d7910ce2fe57a8df27ff8f775e6d397c732d
+SHA-$(FILE1)= 04988d51267566db6899e8061d9f2e5b58fbeec4
 
 # Targets
 

Modified: branches/dm/root/.mozilla/firefox/2qwpcv2u.default/prefs.js
===================================================================
--- branches/dm/root/.mozilla/firefox/2qwpcv2u.default/prefs.js 2005-11-01 
09:18:07 UTC (rev 1020)
+++ branches/dm/root/.mozilla/firefox/2qwpcv2u.default/prefs.js 2005-11-01 
09:57:16 UTC (rev 1021)
@@ -11,7 +11,7 @@
 
 user_pref("browser.preferences.lastpanel", 0);
 user_pref("browser.search.selectedEngine", "Google");
-user_pref("browser.startup.homepage", 
"file:///usr/share/LFS-BOOK-6.1-HTML/index.html");
+user_pref("browser.startup.homepage", 
"file:///usr/share/LFS-BOOK-trunk-HTML/index.html");
 user_pref("browser.startup.homepage_override.mstone", "rv:1.7.7");
 user_pref("extensions.disabledObsolete", true);
 user_pref("extensions.lastAppVersion", "1.0");

-- 
http://linuxfromscratch.org/mailman/listinfo/livecd
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page

Reply via email to