* Makefile.dist: put gdb.dvi stuff (updated to use M4 preprocessor

	stuff for config manual) here where it counts; updated
	to use new subdir structure (gdb/doc/).

	* Makefile: generated from above via
		    config.gdb none
	before checkin

4 files changed, 52 insertions, 14 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 7e91858..33d8087 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,4 +1,12 @@
-Tue May 14 15:31:20 PDT 1991  Roland Pesch (pesch at cygint.cygnus.com)
+Tue May 14 16:29:53 PDT 1991  Roland Pesch (pesch at cygint.cygnus.com)
+
+	* Makefile.dist: put gdb.dvi stuff (updated to use M4 preprocessor
+	stuff for config manual) here where it counts; updated
+	to use new subdir structure (gdb/doc/).
+
+	* Makefile: generated from above via 
+		    config.gdb none 
+	before checkin
 
 	* gdbint.texinfo: added instructions on generating gdb.info* files
 	locally for release.  These are ordinary info
diff --git a/gdb/Makefile b/gdb/Makefile
index eec7b7b..1bec69d 100755
--- a/gdb/Makefile
+++ b/gdb/Makefile
@@ -420,7 +420,7 @@ OTHERS = Makefile.dist depend alldeps.mak Makefile.sdir \
 	 createtags munch config.gdb config.status \
 	 ChangeLog ChangeLog-3.x \
 	 README TODO TAGS WHATS.NEW \
-	 gdb.texinfo gdbint.texinfo gdbrc.tex threecol.tex \
+	 doc \
 	.gdbinit COPYING expread.tab.c stab.def \
 	 copying.c Projects Convex.notes copying.awk \
 	 saber.suppress standalone.c stuff.c kdb-start.c \
@@ -650,8 +650,8 @@ realclean: clean
 	rm -f tm.h xm.h config.status
 	rm -f Makefile
 
-gdb-all.texinfo: gdb.texinfo
-	${M4} pretex.m4 none.m4 all.m4 gdb.texinfo >gdb-all.texinfo
+gdb-all.texinfo: ${srcdir}/doc/gdb.texinfo
+	${M4} $(srcdir)/doc/pretex.m4 $(srcdir)/doc/none.m4 $(srcdir)/doc/all.m4 $(srcdir)/doc/gdb.texinfo >gdb-all.texinfo
 
 gdb.dvi : gdb-all.texinfo
 	tex gdb-all.texinfo
diff --git a/gdb/Makefile.dist b/gdb/Makefile.dist
index b3f9989..dbfb7a3 100755
--- a/gdb/Makefile.dist
+++ b/gdb/Makefile.dist
@@ -43,6 +43,9 @@ YACC=bison -y
 # YACC=yacc
 SHELL=/bin/sh
 MAKE=make
+# We need either GNU m4 or SysV m4; Berkeley/Sun don't have quite enough.
+#M4=gm4
+M4=/usr/5bin/m4
 
 # Set this up with gcc if you have gnu ld and the loader will print out
 # line numbers for undefinded refs.
@@ -188,7 +191,7 @@ OTHERS = Makefile.dist depend alldeps.mak Makefile.sdir \
 	 createtags munch config.gdb config.status \
 	 ChangeLog ChangeLog-3.x \
 	 README TODO TAGS WHATS.NEW \
-	 gdb.texinfo gdbint.texinfo gdbrc.tex threecol.tex \
+	 doc \
 	.gdbinit COPYING expread.tab.c stab.def \
 	 copying.c Projects Convex.notes copying.awk \
 	 saber.suppress standalone.c stuff.c kdb-start.c \
@@ -405,6 +408,7 @@ clean:
 	rm -f init.c init.o version.c
 	rm -f gdb core gdb.tar gdb.tar.Z make.log
 	rm -f gdb[0-9]
+	rm -f gdb.dvi gdb-all*
 	cd readline ; make clean
 
 distclean: clean expread.tab.c TAGS
@@ -417,10 +421,21 @@ realclean: clean
 	rm -f tm.h xm.h config.status
 	rm -f Makefile
 
-gdb.dvi : gdb.texinfo
-	tex gdb.texinfo
-	texindex gdb.??
-	tex gdb.texinfo
+gdb-all.texinfo: ${srcdir}/doc/gdb.texinfo
+	${M4} $(srcdir)/doc/pretex.m4 $(srcdir)/doc/none.m4 $(srcdir)/doc/all.m4 $(srcdir)/doc/gdb.texinfo >gdb-all.texinfo
+
+gdb.dvi : gdb-all.texinfo
+	tex gdb-all.texinfo
+	texindex gdb-all.??
+	tex gdb-all.texinfo
+	mv gdb-all.dvi gdb.dvi
+	rm -f gdb-all.?? gdb-all.???
+
+# This should work eventually, but we're using texinfo2, and many makeinfo's 
+# can't cope with all the markup.  In the meantime, we distribute the info
+# files as formatted by the elisp texinfo2 code.
+#gdb.info: gdb-all.texinfo
+#	makeinfo gdb-all.texinfo
 
 # Make copying.c from COPYING
 copying.c : COPYING copying.awk
diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index b3f9989..dbfb7a3 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -43,6 +43,9 @@ YACC=bison -y
 # YACC=yacc
 SHELL=/bin/sh
 MAKE=make
+# We need either GNU m4 or SysV m4; Berkeley/Sun don't have quite enough.
+#M4=gm4
+M4=/usr/5bin/m4
 
 # Set this up with gcc if you have gnu ld and the loader will print out
 # line numbers for undefinded refs.
@@ -188,7 +191,7 @@ OTHERS = Makefile.dist depend alldeps.mak Makefile.sdir \
 	 createtags munch config.gdb config.status \
 	 ChangeLog ChangeLog-3.x \
 	 README TODO TAGS WHATS.NEW \
-	 gdb.texinfo gdbint.texinfo gdbrc.tex threecol.tex \
+	 doc \
 	.gdbinit COPYING expread.tab.c stab.def \
 	 copying.c Projects Convex.notes copying.awk \
 	 saber.suppress standalone.c stuff.c kdb-start.c \
@@ -405,6 +408,7 @@ clean:
 	rm -f init.c init.o version.c
 	rm -f gdb core gdb.tar gdb.tar.Z make.log
 	rm -f gdb[0-9]
+	rm -f gdb.dvi gdb-all*
 	cd readline ; make clean
 
 distclean: clean expread.tab.c TAGS
@@ -417,10 +421,21 @@ realclean: clean
 	rm -f tm.h xm.h config.status
 	rm -f Makefile
 
-gdb.dvi : gdb.texinfo
-	tex gdb.texinfo
-	texindex gdb.??
-	tex gdb.texinfo
+gdb-all.texinfo: ${srcdir}/doc/gdb.texinfo
+	${M4} $(srcdir)/doc/pretex.m4 $(srcdir)/doc/none.m4 $(srcdir)/doc/all.m4 $(srcdir)/doc/gdb.texinfo >gdb-all.texinfo
+
+gdb.dvi : gdb-all.texinfo
+	tex gdb-all.texinfo
+	texindex gdb-all.??
+	tex gdb-all.texinfo
+	mv gdb-all.dvi gdb.dvi
+	rm -f gdb-all.?? gdb-all.???
+
+# This should work eventually, but we're using texinfo2, and many makeinfo's 
+# can't cope with all the markup.  In the meantime, we distribute the info
+# files as formatted by the elisp texinfo2 code.
+#gdb.info: gdb-all.texinfo
+#	makeinfo gdb-all.texinfo
 
 # Make copying.c from COPYING
 copying.c : COPYING copying.awk