# HG changeset patch
# User Rik <rdrider0-list@yahoo.com>
# Date 1259969631 28800
# Node ID a463aa0aa0ab7fb0b11f6f68b82d4cfb3170e4a3
# Parent  57b41617c9fdb9feeb22aa8617ac2fc60bb02e83
remove lingering Makefile.am options for deleted file conf.texi

diff -r 57b41617c9fd -r a463aa0aa0ab doc/ChangeLog
--- a/doc/ChangeLog	Fri Dec 04 16:05:02 2009 -0500
+++ b/doc/ChangeLog	Fri Dec 04 15:33:51 2009 -0800
@@ -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,
diff -r 57b41617c9fd -r a463aa0aa0ab doc/Makefile.am
--- a/doc/Makefile.am	Fri Dec 04 16:05:02 2009 -0500
+++ b/doc/Makefile.am	Fri Dec 04 15:33:51 2009 -0800
@@ -29,7 +29,7 @@
   texinfo.tex \
   texmf.cnf
 
-SUBDIRS = . faq interpreter liboctave refcard
+SUBDIRS = faq interpreter liboctave refcard
 
 ../BUGS ../INSTALL.OCTAVE:
 	$(MAKE) -C interpreter ../$@
diff -r 57b41617c9fd -r a463aa0aa0ab doc/interpreter/Makefile.am
--- a/doc/interpreter/Makefile.am	Fri Dec 04 16:05:02 2009 -0500
+++ b/doc/interpreter/Makefile.am	Fri Dec 04 15:33:51 2009 -0800
@@ -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 = \
diff -r 57b41617c9fd -r a463aa0aa0ab doc/liboctave/Makefile.am
--- a/doc/liboctave/Makefile.am	Fri Dec 04 16:05:02 2009 -0500
+++ b/doc/liboctave/Makefile.am	Fri Dec 04 15:33:51 2009 -0800
@@ -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: