Mercurial > hg > octave-terminal
changeset 9919:a463aa0aa0ab
remove lingering Makefile.am options for deleted file conf.texi
author | Rik <rdrider0-list@yahoo.com> |
---|---|
date | Fri, 04 Dec 2009 15:33:51 -0800 |
parents | 57b41617c9fd |
children | 56fbe170d354 |
files | doc/ChangeLog doc/Makefile.am doc/interpreter/Makefile.am doc/liboctave/Makefile.am |
diffstat | 4 files changed, 17 insertions(+), 22 deletions(-) [+] |
line wrap: on
line diff
--- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,9 @@ +2009-12-04 Rik <octave@nomad.inbox5.com> + + * Makefile.am, interpreter/Makefile.am, liboctave/Makefile.am: remove + lingering configuration support for conf.texi + * liboctave/Makefile.am: distribute .texi files + 2009-12-04 Rik <octave@nomad.inbox5.com> * interpreter/geometryimages.m, interpreter/interpimages.m,
--- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -29,7 +29,7 @@ texinfo.tex \ texmf.cnf -SUBDIRS = . faq interpreter liboctave refcard +SUBDIRS = faq interpreter liboctave refcard ../BUGS ../INSTALL.OCTAVE: $(MAKE) -C interpreter ../$@
--- a/doc/interpreter/Makefile.am +++ b/doc/interpreter/Makefile.am @@ -23,17 +23,14 @@ include ../../common.mk -AM_MAKEINFOFLAGS = -I.. -I$(srcdir) -I$(srcdir)/.. -AM_MAKEINFOHTMLFLAGS = -I.. -I$(srcdir) -I$(srcdir)/.. - TEXINFO_TEX = ../texinfo.tex -## Extra PATH_SEPARATOR at start and end of list is currently required -## due to weak parsing by texi2XXX scripts. (12/02/09) -TEXINPUTS := "$(PATH_SEPARATOR)..$(PATH_SEPARATOR)$(srcdir)/..$(PATH_SEPARATOR)$(srcdir)$(PATH_SEPARATOR)$(TEXINPUTS)$(PATH_SEPARATOR)" +## Leading PATH_SEPARATOR required due to weak parsing by dvips (12/04/09) +TEXINPUTS := "$(PATH_SEPARATOR)$(srcdir)$(PATH_SEPARATOR)$(TEXINPUTS)$(PATH_SEPARATOR)" export TEXINPUTS -TEXMFCNF := "..$(PATH_SEPARATOR)$(srcdir)$(PATH_SEPARATOR)$(srcdir)/..$(PATH_SEPARATOR)$(PATH_SEPARATOR)$(TEXMFCNF)$(PATH_SEPARATOR)" +## Include custom texmf.cnf necessary to run @seealso macro +TEXMFCNF := "..$(PATH_SEPARATOR)$(srcdir)/..$(PATH_SEPARATOR)$(TEXMFCNF)$(PATH_SEPARATOR)" export TEXMFCNF dist_man1_MANS = \ @@ -147,9 +144,9 @@ contributors.texi \ $(MUNGED_TEXI_SRC) -$(srcdir)/octave.info octave.dvi octave.html octave.pdf: $(srcdir)/version.texi $(octave_TEXINFOS) $(EXAMPLE_FILES) +octave.info octave.dvi octave.html octave.pdf: $(srcdir)/version.texi $(octave_TEXINFOS) $(EXAMPLE_FILES) -$(srcdir)/octave.info: $(IMAGES_TXT) +octave.info: $(IMAGES_TXT) octave.dvi octave.ps: $(IMAGES_EPS) @@ -188,15 +185,13 @@ ../../INSTALL.OCTAVE: install.texi rm -f INSTALL -$(MAKEINFO) -D INSTALLONLY \ - --no-validate --no-headers --no-split --output INSTALL \ - -I.. -I$(srcdir) -I$(srcdir)/.. $< + --no-validate --no-headers --no-split --output INSTALL $< mv INSTALL ../../INSTALL.OCTAVE ../../BUGS: bugs.texi rm -f BUGS -$(MAKEINFO) -D BUGSONLY \ - --no-validate --no-headers --no-split --output BUGS \ - -I.. -I$(srcdir) -I$(srcdir)/.. $< + --no-validate --no-headers --no-split --output BUGS $< mv BUGS ../../BUGS EXTRA_DIST = \
--- a/doc/liboctave/Makefile.am +++ b/doc/liboctave/Makefile.am @@ -23,17 +23,11 @@ include ../../common.mk -AM_MAKEINFOFLAGS = -I.. -I$(srcdir) -I$(srcdir)/.. -AM_MAKEINFOHTMLFLAGS = -I.. -I$(srcdir) -I$(srcdir)/.. - TEXINFO_TEX = ../texinfo.tex -TEXINPUTS = "..$(PATH_SEPARATOR)$(srcdir)$(PATH_SEPARATOR)$(srcdir)/..$(PATH_SEPARATOR)" -export TEXINPUTS - info_TEXINFOS = liboctave.texi -dist_liboctave_TEXINFOS = \ +liboctave_TEXINFOS = \ array.texi \ bugs.texi \ cp-idx.texi \ @@ -58,6 +52,6 @@ EXTRA_DIST = liboctave.dvi liboctave.html liboctave.pdf liboctave.ps -$(srcdir)/liboctave.info liboctave.dvi liboctave.html liboctave.pdf: $(srcdir)/version.texi +liboctave.info liboctave.dvi liboctave.html liboctave.pdf: $(srcdir)/version.texi .NOTPARALLEL: