--- a/doc/interpreter/Makefile.in	Sun Mar 03 17:33:22 1996 +0000
+++ b/doc/interpreter/Makefile.in	Sun Mar 03 17:33:22 1996 +0000
@@ -1,12 +1,12 @@
 #
-# Makefile for octave's doc directory
+# Makefile for octave's doc/interpreter directory
 #
 # John W. Eaton
 # jwe@bevo.che.wisc.edu
 # University of Wisconsin-Madison
 # Department of Chemical Engineering
 
-TOPDIR = ..
+TOPDIR = ../..
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
@@ -30,23 +30,9 @@
 	rluser.texi set.texi signal.texi special.texi stats.texi \
 	stmt.texi strings.texi system.texi var.texi vr-idx.texi
 
-LIB_TEXINFO = liboctave.texi
-
-FAQ_TEXINFO = FAQ.texi
-
-ALL_TEXINFO = $(TEXINFO) $(LIB_TEXINFO) $(FAQ_TEXINFO)
-
-REFCARD = refcard.tex refcard-a4.tex refcard-legal.tex refcard-letter.tex 
+FORMATTED =  octave.dvi octave.ps octave.info octave.info-[0-9]*
 
-FORMATTED =  octave.dvi octave.ps octave.info octave.info-[0-9]* \
-	FAQ.info FAQ.dvi FAQ.ps refcard-a4.dvi refcard-a4.ps \
-	refcard-legal.dvi refcard-legal.ps \
-	refcard-letter.dvi refcard-letter.ps
-#	liboctave.dvi liboctave.ps liboctave.info liboctave.info-[0-9]*
-
-DISTFILES = Makefile.in conf.texi.in conf.texi texinfo.tex dir \
-	octave.1 mkinstalldirs \
-	$(REFCARD) $(ALL_TEXINFO) $(FORMATTED)
+DISTFILES = Makefile.in dir octave.1 conf.texi $(TEXINFO) $(FORMATTED)
 
 SPELL = $(patsubst %.texi, %.spell, $(ALL_TEXINFO))
 
@@ -55,75 +41,17 @@
 	sed -e 's/@@/ at /g' -e 's/@[a-zA-Z]*//g' $< | spell > $@.tmp
 	mv $@.tmp $@
 
-all: octave.info octave.dvi octave.ps FAQ.info FAQ.dvi FAQ.ps \
-	refcard-a4.dvi refcard-a4.ps refcard-legal.dvi refcard-legal.ps \
-	refcard-letter.dvi refcard-letter.ps
-#	liboctave.info liboctave.dvi liboctave.ps
+all: conf.texi octave.info octave.dvi octave.ps
 .PHONY: all
 
-octave.info: $(TEXINFO) conf.texi
-	-makeinfo -I$(srcdir) octave.texi
-
-octave.dvi: $(TEXINFO) conf.texi
-	-texi2dvi $(srcdir)/octave.texi
-
-octave.ps: octave.dvi
-	-dvips -o octave.ps octave.dvi
-
-FAQ.info: FAQ.texi
-	-makeinfo -I$(srcdir) FAQ.texi
-
-FAQ.dvi: FAQ.texi
-	-texi2dvi $(srcdir)/FAQ.texi
-
-FAQ.ps: FAQ.dvi
-	-dvips -o FAQ.ps FAQ.dvi
-
-liboctave.info: $(LIB_TEXINFO) conf.texi
-	-makeinfo -I$(srcdir) liboctave.texi
-
-liboctave.dvi: $(LIB_TEXINFO) conf.texi
-	-texi2dvi $(srcdir)/liboctave.texi
-
-liboctave.ps: liboctave.dvi
-	-dvips -o liboctave.ps liboctave.dvi
-
-refcard-a4.dvi: refcard-a4.tex refcard.tex
-	-TEXINPUTS="$(TEXINPUTS):$(srcdir)" ; export TEXINPUTS ; \
-	  tex $(srcdir)/refcard-a4.tex
-
-refcard-a4.ps: refcard-a4.dvi
-	-dvips -T 297mm,210mm -o refcard-a4.ps refcard-a4.dvi
-
-refcard-legal.dvi: refcard-legal.tex refcard.tex
-	-TEXINPUTS="$(TEXINPUTS):$(srcdir)" ; export TEXINPUTS ; \
-	  tex $(srcdir)/refcard-legal.tex
-
-refcard-legal.ps: refcard-legal.dvi
-	-dvips -T 14in,8.5in -o refcard-legal.ps refcard-legal.dvi
-
-refcard-letter.dvi: refcard-letter.tex refcard.tex
-	-TEXINPUTS="$(TEXINPUTS):$(srcdir)" ; export TEXINPUTS ; \
-	  tex $(srcdir)/refcard-letter.tex
-
-refcard-letter.ps: refcard-letter.dvi
-	-dvips -T 11in,8.5in -o refcard-letter.ps refcard-letter.dvi
-
-../INSTALL.OCTAVE: install1.texi install.texi
-	-makeinfo --no-header --output INSTALL \
-	  -I$(srcdir)/doc install1.texi && mv INSTALL ../INSTALL.OCTAVE
-
-../BUGS: bugs1.texi bugs.texi
-	-makeinfo --no-header --output BUGS \
-	  -I$(srcdir)/doc bugs1.texi && mv BUGS ../BUGS
-
 # This mess is supposed to prevent us from making info files
 # unnecessarily when building Octave in a subdirectory.
 
-conf.texi: $(srcdir)/../src/version.h ../Makeconf Makefile conf.texi.in
+conf.texi: $(srcdir)/../../src/version.h ../../Makeconf Makefile \
+	$(srcdir)/../conf.texi.in
 	@echo "Making conf.texi from conf.texi.in..."
 	@(version_val=${version}; \
-	sed < $(srcdir)/conf.texi.in > conf.texi.tmp \
+	sed < $(srcdir)/../conf.texi.in > conf.texi.tmp \
 	-e "s;%OCTAVE_VERSION%;$$version_val;" \
 	-e "s;%OCTAVE_HOME%;${prefix};")
 	@if test "$(srcdir)" = "." ; then \
@@ -137,6 +65,25 @@
 	  fi; \
 	fi
 
+octave.info: $(TEXINFO) conf.texi
+	-makeinfo -I$(srcdir) -I$(srcdir)/.. octave.texi
+
+octave.dvi: $(TEXINFO) conf.texi
+	-TEXINPUTS="$(srcdir):$(srcdir)/..:$(TEXINPUTS):" ; \
+	  export TEXINPUTS ; \
+	  texi2dvi $(srcdir)/octave.texi
+
+octave.ps: octave.dvi
+	-dvips -o octave.ps octave.dvi
+
+../INSTALL.OCTAVE: install1.texi install.texi
+	-makeinfo --no-header --output INSTALL \
+	  -I$(srcdir)/doc install1.texi && mv INSTALL ../INSTALL.OCTAVE
+
+../BUGS: bugs1.texi bugs.texi
+	-makeinfo --no-header --output BUGS \
+	  -I$(srcdir)/doc bugs1.texi && mv BUGS ../BUGS
+
 check: all
 .PHONY: check
 
@@ -180,8 +127,7 @@
 .PHONY: install
 
 uninstall:
-	rm -f $(infodir)/octave.info* $(infodir)/liboctave.info*
-	rm -f $(mandir)/octave.$(manext)
+	rm -f $(infodir)/octave.info* $(mandir)/octave.$(manext)
 .PHONY: uninstall
 
 tags: $(SOURCES)
@@ -198,10 +144,7 @@
 	octave.ky octave.op octave.pg octave.rd octave.tp octave.vr \
 	octave.cps octave.fns octave.ins octave.kys octave.ops \
 	octave.pgs octave.rds octave.tps octave.vrs octave.aux \
-	octave.log octave.toc liboctave.cp \
-	liboctave.fn liboctave.pg liboctave.tp liboctave.cps \
-	liboctave.fns liboctave.pgs liboctave.tps liboctave.aux \
-	liboctave.log liboctave.toc
+	octave.log octave.toc
 .PHONY: mostlyclean clean
 
 distclean: clean
@@ -210,19 +153,16 @@
 
 maintainer-clean: distclean
 	rm -f tags TAGS octave.info octave.info-* octave.dvi octave.ps \
-	liboctave.info liboctave.info-* liboctave.dvi liboctave.ps \
-	FAQ.info FAQ.info-* FAQ.dvi FAQ.ps \
-	refcard-*.dvi refcard-*.ps
 .PHONY: maintainer-clean
 
 local-dist: all
-	ln $(DISTFILES) ../`cat ../.fname`/doc
+	ln $(DISTFILES) ../`cat ../.fname`/doc/interpreter
 .PHONY: local-dist
 
 dist: all
-	ln $(DISTFILES) ../`cat ../.fname`/doc
+	ln $(DISTFILES) ../`cat ../.fname`/doc/interpreter
 .PHONY: dist
 
 doc-dist: all
-	ln $(FORMATTED) ../`cat ../.fname`/doc
+	ln $(FORMATTED) ../`cat ../.fname`/doc/interpreter
 .PHONY: doc-dist