Reiner Steib
2005-02-03 15:30:38 UTC
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.
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/
,,,
(o o)
---ooO-(_)-Ooo--- | PGP key available | http://rsteib.home.pages.de/