Discussion:
Makefile.in: location of *.html
Reiner Steib
2005-02-03 15:30:38 UTC
Permalink
Hi,

this change...

,----
| --- Makefile.in 12 Jan 2005 14:28:13 -0000 1.75
| +++ Makefile.in 12 Jan 2005 14:45:54 -0000 1.76
| @@ -232,7 +232,7 @@
| [...]
| cp ChangeLog $(FTPDIR)
| - cp doc/*.html $(WWWDIR)/doc
| + cp doc/auctex/*.html $(WWWDIR)/doc
| chmod -R go-w+rX auctex-$(TAG)
| [...]
`----

... breaks building of the snapshots on my system (Thanks to Christian
Schlauer for pointing this out). Probably the default output location
of texi2html has changed.

We should either specify the output directory explicitly (1) in
doc/Makefile.in or add something like (2) in Makefile.in.

(1)
--8<---------------cut here---------------start------------->8---
--- Makefile.in 29 Nov 2004 16:34:12 +0100 1.21
+++ Makefile.in 03 Feb 2005 16:28:27 +0100
@@ -21,10 +21,10 @@
all: auctex.dvi tex-ref.dvi auctex.info

dist: auctex.info INSTALL INSTALL.windows README CHANGES TODO FAQ \
- auctex_toc.html auctex.ps auctex.pdf tex-ref.ps tex-ref.pdf
+ auctex/auctex_toc.html auctex.ps auctex.pdf tex-ref.ps tex-ref.pdf

-auctex_toc.html: auctex.texi
- $(TEXI2HTML) -split_node auctex.texi
+auctex/auctex_toc.html: auctex.texi
+ $(TEXI2HTML) -subdir=auctex -split_node auctex.texi

tex-ref.dvi: tex-ref.tex
$(TEX) tex-ref
--8<---------------cut here---------------end--------------->8---

(2)
--8<---------------cut here---------------start------------->8---
--- Makefile.in 31 Jan 2005 11:35:46 -0000 1.77
+++ Makefile.in 3 Feb 2005 15:21:06 -0000
@@ -233,7 +233,12 @@
cp RELEASE $(FTPDIR)/RELEASE-$(TAG)
cp doc/auctex.ps doc/auctex.pdf doc/tex-ref.ps doc/tex-ref.pdf $(FTPDIR)
cp ChangeLog $(FTPDIR)
- cp doc/auctex/*.html $(WWWDIR)/doc
+# Different texi2html output defaults:
+ if [ -f "doc/auctex/auctex.html" ]; then \
+ cp doc/auctex/*.html $(WWWDIR)/doc; \
+ else \
+ cp doc/*.html $(WWWDIR)/doc; \
+ fi
chmod -R go-w+rX auctex-$(TAG)
tar -cf - auctex-$(TAG) | gzip --best > $(FTPDIR)/auctex-$(TAG).tar.gz
-zip -r $(FTPDIR)/auctex-$(TAG).zip auctex-$(TAG)
--8<---------------cut here---------------end--------------->8---

I think (1) is preferable. Opinions?

Bye, Reiner.
--
,,,
(o o)
---ooO-(_)-Ooo--- | PGP key available | http://rsteib.home.pages.de/
Jan-Ake Larsson
2005-02-03 19:32:25 UTC
Permalink
Post by Reiner Steib
I think (1) is preferable. Opinions?
I agree.
/JÅ
--
"I hope to die before I _have_ to use Microsoft Word."
Donald E. Knuth
David Kastrup
2005-02-03 23:49:10 UTC
Permalink
Post by Reiner Steib
this change...
,----
| --- Makefile.in 12 Jan 2005 14:28:13 -0000 1.75
| +++ Makefile.in 12 Jan 2005 14:45:54 -0000 1.76
| [...]
| cp ChangeLog $(FTPDIR)
| - cp doc/*.html $(WWWDIR)/doc
| + cp doc/auctex/*.html $(WWWDIR)/doc
| chmod -R go-w+rX auctex-$(TAG)
| [...]
`----
... breaks building of the snapshots on my system (Thanks to Christian
Schlauer for pointing this out). Probably the default output location
of texi2html has changed.
Probably, since it looks like it was a "fly by" change I did to get
the last release to compile. I am using a rather experimental Fedora
setup, so my executables should be pretty up to date. To wit:

Name : tetex Relocations: (not relocatable)
Version : 2.0.2 Vendor: Red Hat, Inc.
Release : 30 Build Date: Wed 19 Jan 2005 11:41:34
AM CET
Install Date: Fri 21 Jan 2005 01:20:52 AM CET Build Host: decompose.build.r
edhat.com
Group : Applications/Publishing Source RPM: tetex-2.0.2-30.src.rpm
Size : 35425577 License: distributable
Signature : (none)
Packager : Red Hat, Inc. <http://bugzilla.redhat.com/bugzilla>
URL : http://www.tug.org/teTeX/
Summary : The TeX text formatting system.

Uh, I mean, so my executables should be ancient as petrified reptile
droppings. Whatever.

I needed that change to get the _standard_ Fedora build succeed. So
we better find a solution that will work with both older and newer
setups. The Fedora texi2html says:

Usage: texi2html [OPTIONS] TEXINFO-FILE
Translates Texinfo source documentation to HTML.
Option Type Default Description
-debug=i 0 output HTML with debuging information
-expand=s info Expand info|tex|none section of texinfo source
-help:i print help and exit
-I=s append $s to the @include search path
-init_file=s load init file $s
-l2h! if set, uses latex2html for @math and @tex
-lang=s use $s as document language (ISO 639 encoding)
-menu! 1 ouput Texinfo menus
-number! 1 use numbered sections
-out_file=s if set, all HTML output goes into file $s
-prefix=s use as prefix for output files, instead of <docname>
-sec_nav! 1 output navigation panels for each section
-short_ext! 0 use "htm" extension for output HTML files
-short_ref! if set, references are without section numbers
-split=s split document on section|chapter else no splitting
-subdir=s put HTML files in directory $s, instead of $cwd
-toc_file=s use $s as ToC file, instead of <docname>_toc.html
-top_file=s use $s as top file, instead of <docname>.html
-Verbose! print progress info to stdout
-version print version and exit
Note: 'Options' may be abbreviated. 'Type' specifications mean:
<none>| ! no argument: variable is set to 1 on -foo (or, to 0 on -nofoo)
=s | :s mandatory (or, optional) string argument
=i | :i mandatory (or, optional) integer argument
Post by Reiner Steib
We should either specify the output directory explicitly (1) in
doc/Makefile.in or add something like (2) in Makefile.in.
(1)
--8<---------------cut here---------------start------------->8---
--- Makefile.in 29 Nov 2004 16:34:12 +0100 1.21
+++ Makefile.in 03 Feb 2005 16:28:27 +0100
@@ -21,10 +21,10 @@
all: auctex.dvi tex-ref.dvi auctex.info
dist: auctex.info INSTALL INSTALL.windows README CHANGES TODO FAQ \
- auctex_toc.html auctex.ps auctex.pdf tex-ref.ps tex-ref.pdf
+ auctex/auctex_toc.html auctex.ps auctex.pdf tex-ref.ps tex-ref.pdf
-auctex_toc.html: auctex.texi
- $(TEXI2HTML) -split_node auctex.texi
+auctex/auctex_toc.html: auctex.texi
+ $(TEXI2HTML) -subdir=auctex -split_node auctex.texi
tex-ref.dvi: tex-ref.tex
$(TEX) tex-ref
--8<---------------cut here---------------end--------------->8---
That looks like it could work.

However, the TeXlive2003 texi2html offers only options:

/usr/TeX/bin/i386-linux/texi2html -subdir=auctex xxx.texi
This is texi2html 1.56k
To convert a Texinfo file to HMTL: /usr/TeX/bin/i386-linux/texi2html [options] file
where options can be:
-expandinfo : use @ifinfo sections, not @iftex
-glossary : handle a glossary
-invisible name: use 'name' as an invisible anchor
-Dname : define name like with @set
-I dir : search also for files in 'dir'
-menu : handle menus
-monolithic : output only one file including ToC
-number : number sections
-split_chapter : split on main sections
-split_node : split on nodes
-usage : print usage instructions
-verbose : verbose output
To check converted files: /usr/TeX/bin/i386-linux/texi2html -check [-verbose] files

and TeXlive2004:

Usage: texi2html [OPTIONS] TEXINFO-FILE
Translates Texinfo source documentation to HTML.
Option Type Default Description
--css-include=s use css file $s
--debug=i 0 output HTML with debuging information
--help:i print help and exit
--I=s append $s to the @include search path
--ifhtml! expand ifhtml and html sections
--ifinfo! expand ifinfo
--ifplaintext! expand ifplaintext sections
--iftex! expand iftex and tex sections
--ifxml! expand ifxml and xml sections
--init-file=s load init file $s
--l2h! if set, uses latex2html for @math and @tex
--lang=s use $s as document language (ISO 639 encoding)
--macro-expand=s output macro expanded source in <file>
--menu! 1 output Texinfo menus
--no-expand=s Don't expand the given section of texinfo source
--no-validate! 0 suppress node cross-reference validation
--node-files! 0 produce one file per node for cross references
--number! 1 use numbered sections
--output=s output goes to $s (directory if split)
--P=s prepend $s to the @include search path
--prefix=s use as prefix for output files, instead of <docname>
--sec-nav! 1 output navigation panels for each section
--short-ext! 0 use "htm" extension for output HTML files
--short-ref! if set, references are without section numbers
--split=s
split document on section|chapter|node else no splitting
--toc-file=s use $s as ToC file, instead of <docname>_toc.html
--toc-links! 0 create links from headings to toc entries
--top-file=s use $s as top file, instead of <docname>.html
--use-nodes! 0 use nodes for sectionning
--Verbose! print progress info to stdout
--version print version and exit
Note: 'Options' may be abbreviated. 'Type' specifications mean:
<none>| ! no argument: variable is set to 1 on -foo (or, to 0 on -nofoo)
=s | :s mandatory (or, optional) string argument
=i | :i mandatory (or, optional) integer argument
Post by Reiner Steib
I think (1) is preferable. Opinions?
The -subdir= option seems to be not well-supported. While it will
work with a tetex-2.0.2 Fedora setup, it will neither work with
TeXlive2003 or TeXlive2004.

So I am afraid that (1) does not look like a winner here.
--
David Kastrup, Kriemhildstr. 15, 44793 Bochum
Loading...