From: Gary V. Vaughan Date: Sun, 22 Feb 2004 16:23:48 +0000 (+0000) Subject: * Makefile.am (web-manual): Generate the web manual carefully X-Git-Tag: release-1-5-4~9 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a5c1aa3934840ba9b5570720293a30e4755bdb00;p=thirdparty%2Flibtool.git * Makefile.am (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 565b9d4a9..8d89e39c6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2004-02-22 Gary V. Vaughan + + * Makefile.am (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-18 Gary V. Vaughan * commit (SHELL): Set it explicitly, incase some madman is using @@ -6,7 +13,7 @@ 2004-02-15 Peter O'Gorman * libtool.m4, ltmain.in: Rename shrext to shrext_cmds. - + 2004-02-13 Gary V. Vaughan * commit (MKSTAMP): Look for mkstamp in the right place. diff --git a/Makefile.am b/Makefile.am index bc3a539de..0af846b07 100644 --- a/Makefile.am +++ b/Makefile.am @@ -25,7 +25,7 @@ CLEANFILES = libtool libtoolize ltmain.shT # Since _SCRIPTS gets the program transform applied we make them # executable by hand pkgdata_DATA = config.guess config.sub ltmain.sh - + # This macro file should be visible to Automake's aclocal. aclocal_DATA = $(aclocal_macros) @@ -88,8 +88,10 @@ install-data-hook: ## not to anybody else (inspiration from automake/Makefile.am). ## ## ---------------------------------------------------------------- ## +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"; \ @@ -97,8 +99,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: @@ -232,7 +235,6 @@ delta-diff: prev-tarball new-tarball ## Unpack the tarballs somewhere to diff them rm -rf delta-diff mkdir delta-diff - ofile="../$(PACKAGE)-$(LASTRELEASE)-$(VERSION).diff.gz"; \ cd delta-diff \ && tar xzf "../$(PACKAGE)-$(LASTRELEASE).tar.gz" \ @@ -244,9 +246,8 @@ delta-diff: prev-tarball new-tarball && echo "directory: libtool" > $$ofile.directive \ && $(GPG) --clearsign $$ofile.directive \ && rm -f $$ofile.directive - rm -rf delta-diff - + XDELTA = xdelta XDELTA_OPTIONS = --pristine -9 @@ -265,3 +266,9 @@ delta-xdelta: prev-tarball new-tarball got-xdelta && $(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 5a0967ef1..96a71a41a 100644 --- a/README-alpha +++ b/README-alpha @@ -117,7 +117,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. @@ -131,7 +131,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 @@ -179,7 +179,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