* Makefile.maint (web-manual): Generate the web manual carefully

so that links will still work when it is uploaded to gnu.org.
* README-alpha: Note that this rule should be used at release
time.

diff --git a/ChangeLog b/ChangeLog
index 516c7e02058c6e27155b5310333f9cb38b0ff7d8..4081b2b49cbccc5df17afddbcceaaca6a019fd59 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-02-22  Gary V. Vaughan  <gary@gnu.org>
+
+       * Makefile.maint (web-manual): Generate the web manual carefully
+       so that links will still work when it is uploaded to gnu.org.
+       * README-alpha: Note that this rule should be used at release
+       time.
+
 2004-02-20  Gary V. Vaughan  <gary@gnu.org>
 
        Sweeping changes to the user interface to libtool from

diff --git a/Makefile.maint b/Makefile.maint
index 13c03017d27c8c89941710f00df2db6755cefa53..a44efd649786c5686a02573fb0678e84cb8cd56f 100644 (file)
--- a/Makefile.maint
+++ b/Makefile.maint
@@ -25,9 +25,10 @@ Makefile:
        @echo " *** maintainer rules."
        @exit 1
 
+TEXI2HTML = texi2html
 
 .PHONY: cvs-release
-cvs-release: version-check prev-tarball cvs-news fetch cvs-commit cvs-dist deltas
+cvs-release: version-check prev-tarball cvs-news fetch cvs-commit cvs-dist deltas web-manual
        @tarname="$(PACKAGE)-$(VERSION).tar.gz"; \
        diffname="$(PACKAGE)-$(LASTRELEASE)-$(VERSION).diff.gz"; \
        xdeltaname="$(PACKAGE)-$(LASTRELEASE)-$(VERSION).xdelta"; \
@@ -35,8 +36,9 @@ cvs-release: version-check prev-tarball cvs-news fetch cvs-commit cvs-dist delta
        echo " *** $$tarname.directive.asc, $$diffname,"; \
        echo " *** $$diffname.sig, $$diffname.directive.asc,"; \
        echo " *** $$xdeltaname, $$xdeltaname.sig and";\
-       echo " *** $$xdeltaname.directive.asc to either";\
-       echo " *** /incoming/alpha or /incoming/ftp on ftp-upload.gnu.org.";
+       echo " *** $$xdeltaname.directive.asc to either"
+       echo " *** /incoming/alpha or /incoming/ftp on ftp-upload.gnu.org."
+       echo " *** You might need to upload manual.html to webcvs/libtool."
 
 .PHONY: version-check
 version-check:
@@ -200,3 +202,10 @@ delta-xdelta: prev-tarball new-tarball got-xdelta
        && echo "directory: libtool" > $$ofile.directive \
        && $(GPG) --clearsign $$ofile.directive \
        && rm -f $$ofile.directive
+
+.PHONY: web-manual
+web-manual:
+       @$(LN_S) $(top_srcdir)/doc/libtool.texi doc/manual.texi
+       $(TEXI2HTML) -I doc -monolithic -number -verbose doc/manual.texi
+       @mv doc/manual.html manual.html
+       @rm -f doc/manual.texi

diff --git a/README-alpha b/README-alpha
index 309d7f7e83b5eca7e13bd03342ca7297823c875a..306ffd18963d2242b67bc63c63db7930071b8168 100644 (file)
--- a/README-alpha
+++ b/README-alpha
@@ -118,7 +118,7 @@ using (by typing `libtool --version').
 
 * Send announcement to libtool@gnu.org and autotools-announce@gnu.org,
   if not an alpha send to info-gnu@gnu.org as well.
-  
+
 * Update version number in configure.ac to next alpha number.
   See http://www.gnu.org/software/libtool/contribute.html for details of
   the numbering scheme.
@@ -132,7 +132,7 @@ using (by typing `libtool --version').
   release announcement.
 
 * If not an alpha, replace manual.html with the new one
-  (generate with cd doc && texi2html libtool.texi)
+  (generate with `make -f Makefile.maint web-manual').
 
 ================================================================
 = Alpha release note template
@@ -184,7 +184,7 @@ projects.
 
 Alternatively, you can fetch the unbootstrapped sourcecode from
 anonymous cvs by using the following commands:
- 
+
   $ export CVS_RSH=ssh
   $ cvs -z3 -d :ext:anoncvs@savannah.gnu.org:/cvsroot/libtool \
   co -r @CVS_RELEASE_TAG@ libtool