Author: alexander
Date: 2005-10-09 01:15:52 -0600 (Sun, 09 Oct 2005)
New Revision: 900

Modified:
   branches/utf8-newmake/packages/LFS-BOOK/Makefile
   branches/utf8-newmake/root/.mozilla/firefox/2qwpcv2u.default/prefs.js
Log:
Merged logic from trunk for setting browser home pages after rendering LFS book


Modified: branches/utf8-newmake/packages/LFS-BOOK/Makefile
===================================================================
--- branches/utf8-newmake/packages/LFS-BOOK/Makefile    2005-10-08 21:10:40 UTC 
(rev 899)
+++ branches/utf8-newmake/packages/LFS-BOOK/Makefile    2005-10-09 07:15:52 UTC 
(rev 900)
@@ -3,9 +3,11 @@
 NM= LFS-BOOK
 VRS= trunk
 DIR= $(NM)
+HDIR=$(DIR)-HTML
 
 FILE= $(NM)-$(VRS).tar.bz2
 URL= svn://svn.linuxfromscratch.org/LFS/$(VRS)/BOOK
+FIREFOX_CONFIG= $(ROOT)/root/.mozilla/firefox/2qwpcv2u.default/prefs.js
 
 # Targets
 
@@ -24,7 +26,11 @@
        $(std_build)
 
 compile-stage2:
-       make BASEDIR=/usr/share/$(DIR)-HTML
+       make BASEDIR=/usr/share/$(HDIR)
+       sed -i '[EMAIL PROTECTED]:///[EMAIL 
PROTECTED]:///usr/share/$(HDIR)/index.html@' \
+            $(FIREFOX_CONFIG)
+       sed -i '[EMAIL 
PROTECTED]".*\"@WWW_HOME=\"/usr/share/$(HDIR)/index.html\"@' \
+            $(ROOT)/etc/profile
 
 clean:
        -rm -rf $(DIR)

Modified: branches/utf8-newmake/root/.mozilla/firefox/2qwpcv2u.default/prefs.js
===================================================================
--- branches/utf8-newmake/root/.mozilla/firefox/2qwpcv2u.default/prefs.js       
2005-10-08 21:10:40 UTC (rev 899)
+++ branches/utf8-newmake/root/.mozilla/firefox/2qwpcv2u.default/prefs.js       
2005-10-09 07:15:52 UTC (rev 900)
@@ -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-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