changeset 6047:e790935a9c28

web/basics: salvage Graham's Sharing Directories warning.
author Jan Nieuwenhuizen <janneke@gnu.org>
date Mon, 22 Nov 2010 13:53:10 +0100
parents a03589c006b0
children 9e4fa4106646
files GNUmakefile README web/basics.html web/index.html
diffstat 4 files changed, 33 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/GNUmakefile	Sun Nov 21 18:50:29 2010 +0100
+++ b/GNUmakefile	Mon Nov 22 13:53:10 2010 +0100
@@ -43,7 +43,7 @@
 	bin/gub -p $(BUILD_PLATFORM) --branch=lilypond=master:master lilypond -vvv
 
 README: web/index.html web/basics.html web/lilypond.html web/denemo.html web/inkscape.html web/oo.o.html web/history.html web/links.html
-	w3m -dump $^ > $@
+	w3m -dump $^ | sed 's/website by.*$..//' > $@
 
 web: README
 	scp -p web/*.html web/*.css lilypond.org:/var/www/lilypond/gub
--- a/README	Sun Nov 21 18:50:29 2010 +0100
+++ b/README	Mon Nov 22 13:53:10 2010 +0100
@@ -153,6 +153,8 @@
 
     this leaves the Windows installer in uploads/
 
+                           
+
 GUB the Grand Unified Builder
 
   • Home
@@ -212,10 +214,10 @@
 SHARING DIRECTORIES
 
 GUB uses an ABI environment variable to work around some build bugs in some
-packages.  This variable is not checked by the environment-changed function,
-so problems will probably occur if you share your GUB build directory between
-a 32-bit and 64-bit OS.  If you change your operating system, delete the
-target/ directory of GUB before trying to build it again.
+packages. This variable is not checked by the environment-changed function, so
+problems will probably occur if you share your GUB build directory between a
+32-bit and 64-bit OS. If you change your operating system, delete the target/
+directory of GUB before trying to build it again.
 
 LIBRESTRICT
 
@@ -474,6 +476,9 @@
 More examples
 
 See gub/specs/*.py for some more examples.
+
+                           
+
 GUB -- LilyPond
 
 INSTALLING
@@ -577,6 +582,8 @@
                       --smtp smtp.xs4all.nl --repository downloads/lilypond.git"\
       darwin-x86 freebsd-x86 freebsd-64 mingw linux-x86 linux-64 darwin-ppc
 
+                           
+
 GUB -- GNU Denemo
 
 INSTALLING
@@ -617,6 +624,8 @@
 
       make -f lilypond.make bootstrap
 
+                           
+
 GUB -- Inkscape
 
 INSTALLING
@@ -645,6 +654,8 @@
       bin/gub inkscape
       bin/gib inkscape --branch=inkscape=trunk inkscape
 
+                           
+
 GUB -- OpenOffice.org
 
 INSTALLING
@@ -713,6 +724,9 @@
 
 http://github.com/janneke/gub/tree/master/patches
 http://lilypond.org/blog/janneke/gub3-ooo-mingw-cross-build
+
+                           
+
 GUB the Grand Unified Builder
 
   • Home
@@ -758,6 +772,8 @@
 and implementing x.org dependencies. After that, building a windows installer
 for GNU Denemo took only one day, including all dependencies.
 
+                           
+
 GUB the Grand Unified Builder
 
   • Home
@@ -779,3 +795,6 @@
 openembedded.org
 scratchbox.org
 Scratbox2; sb2 Dan Kegel's crosstool
+
+                           
+
--- a/web/basics.html	Sun Nov 21 18:50:29 2010 +0100
+++ b/web/basics.html	Mon Nov 22 13:53:10 2010 +0100
@@ -133,6 +133,15 @@
     This makes that forcing rebuilds can can be tricky: gub refuses to
     do so if it deems rebuilding unnecessary.
     
+    <h3>SHARING DIRECTORIES</h3>
+
+    GUB uses an ABI environment variable to work around some build
+    bugs in some packages.  This variable is not checked by the
+    environment-changed function, so problems will probably occur if
+    you share your GUB build directory between a 32-bit and 64-bit OS.
+    If you change your operating system, delete the target/ directory
+    of GUB before trying to build it again.
+
     <h3>LIBRESTRICT</h3>
 
     A common problem with [making reproducible cross] builds is using
--- a/web/index.html	Sun Nov 21 18:50:29 2010 +0100
+++ b/web/index.html	Mon Nov 22 13:53:10 2010 +0100
@@ -200,10 +200,5 @@
 	website by <a href="http://joyofsource.com">Joy of Source</a>
       </p>
     </div>
-    <div id="footer">
-      <p align="center" style="font-size:60%">
-	website by <a href="http://joyofsource.com">Joy of Source</a>
-      </p>
-    </div>
 </body>
 </html>