ld.texinfo:

Conditionalize manual to maintain Cygnus, Hitachi versions in parallel.
(Texinfo conditionals are stable enough to permit this, at last!)
NOTE: @ignore'd passages from earlier versions DELETED; use CVS history
      to retrieve if wanted.

gen-doc.texi, h8-doc.texi: manual configuration definitions.

Makefile.in: link config defn (`gen' by default) to configdoc.texi, included
      by ld.texinfo

.Sanitize: add gen-doc.texi, h8-doc.texi

3 files changed, 50 insertions, 11 deletions

diff --git a/ld/.Sanitize b/ld/.Sanitize
index c17ba98..91ee664 100644
--- a/ld/.Sanitize
+++ b/ld/.Sanitize
@@ -49,7 +49,9 @@ ebmon29k.sc-sh
 ebmon29k.sh
 generic.em
 genscripts.sh
+h8-doc.texi
 ld.1
+gen-doc.texi
 gld960.em
 gld960.sh
 go32.sh
@@ -161,7 +163,21 @@ fi
 #
 #
 # $Log$
-# Revision 1.54  1993/03/09 18:12:14  ian
+# Revision 1.55  1993/03/30 23:24:53  pesch
+# ld.texinfo:
+# Conditionalize manual to maintain Cygnus, Hitachi versions in parallel.
+# (Texinfo conditionals are stable enough to permit this, at last!)
+# NOTE: @ignore'd passages from earlier versions DELETED; use CVS history
+#       to retrieve if wanted.
+#
+# gen-doc.texi, h8-doc.texi: manual configuration definitions.
+#
+# Makefile.in: link config defn (`gen' by default) to configdoc.texi, included
+#       by ld.texinfo
+#
+# .Sanitize: add gen-doc.texi, h8-doc.texi
+#
+# Revision 1.54  1993/03/09  18:12:14  ian
 # Removed obsolete Makefile.dos.
 #
 # Revision 1.53  1993/03/04  20:49:05  ian
diff --git a/ld/Makefile.in b/ld/Makefile.in
index 8b64bc8..73cf6fe 100644
--- a/ld/Makefile.in
+++ b/ld/Makefile.in
@@ -53,8 +53,9 @@ AR = ar
 AR_FLAGS = qv
 CFLAGS = -g
 MAKEINFO = makeinfo
+TEXI2DVI = texi2dvi
 RANLIB = ranlib
-HOST_CC=$(CC)
+CC_FOR_BUILD=$(CC)
 BISON = `if [ -f ../bison/bison ] ; then echo ../bison/bison -y -L../bison/bison ; else echo bison -y ; fi`
 LEX = `if [ -f ../flex/flex ] ; then echo ../flex/flex ;  else echo flex ; fi`
 
@@ -73,6 +74,9 @@ BASEDIR	= ../..
 INCLUDE	= $(srcdir)/../include
 INCLUDES = -I. -I$(srcdir) -I$(srcdir)/../bfd -I$(INCLUDE) 
 
+# What version of the manual to build
+DOCVER = gen
+
 # Where to find texinfo.tex to format docn with TeX
 TEXIDIR = $(srcdir)/../texinfo/fsf
 
@@ -155,6 +159,7 @@ STAGESTUFF = *.x *.x[runN] *.sc[runN] $(GENERATED_SOURCES) $(GENERATED_HEADERS)
 all: $(LD_PROG)
 
 check: bootstrap check-cdtest
+installcheck:
 info: ld.info
 
 ldgram.h ldgram.c: ldgram.y
@@ -169,7 +174,6 @@ DEF_EMUL = ` if [ -z "$(EMUL)" ] ; then \
 	     else \
 	       echo -DDEFAULT_EMULATION='"$(EMUL)"' ; \
              fi`
-	       
 
 ldmain.o: ldmain.c
 	$(CC) $(CFLAGS) $(INCLUDES) $(HDEFINES) $(TDEFINES) $(CDEFINES) $(DEF_EMUL) -c $<
@@ -304,18 +308,24 @@ check-cdtest: cdtest $(srcdir)/cdtest.exp
 
 ######################################################################
 # DOCUMENTATION TARGETS
+# Manual configuration file; not usually attached to normal configuration,
+# because almost all configs use "gen" version of manual.
+#  Set DOCVER above to change.
+configdoc.texi:	${DOCVER}-doc.texi
+	ln -s ${DOCVER}-doc.texi configdoc.texi || \
+	ln ${DOCVER}-doc.texi configdoc.texi || \
+	cp ${DOCVER}-doc.texi configdoc.texi
+
 # TeX output
+dvi: ld.dvi
 ld.dvi: $(srcdir)/ld.texinfo
-	TEXINPUTS=${TEXIDIR}:.:$$TEXINPUTS tex $(srcdir)/ld.texinfo
-	texindex ld.??
-	TEXINPUTS=${TEXIDIR}:.:$$TEXINPUTS tex $(srcdir)/ld.texinfo
+	$(TEXI2DVI) $(srcdir)/ld.texinfo
+
 ldint.dvi: $(srcdir)/ldint.texinfo
-	TEXINPUTS=${TEXIDIR}:.:$$TEXINPUTS tex $(srcdir)/ldint.texinfo
-	texindex ldint.??
-	TEXINPUTS=${TEXIDIR}:.:$$TEXINPUTS tex $(srcdir)/ldint.texinfo
+	$(TEXI2DVI) $(srcdir)/ldint.texinfo
 
 # info file for online browsing
-ld.info: $(srcdir)/ld.texinfo
+ld.info: $(srcdir)/ld.texinfo configdoc.texi
 	$(MAKEINFO) -o ld.info $(srcdir)/ld.texinfo
 
 ldint.info: $(srcdir)/ldint.texinfo
@@ -399,7 +409,7 @@ ld-index.me: ld.me
 ######################################################################
 
 ./mkscript: $(srcdir)/mkscript.c
-	$(HOST_CC)  -o mkscript $(srcdir)/mkscript.c
+	$(CC_FOR_BUILD)  -o mkscript $(srcdir)/mkscript.c
 
 ldlex.o: ldlex.c ldgram.h
 ldgram.o: ldgram.c
diff --git a/ld/h8-doc.texi b/ld/h8-doc.texi
new file mode 100644
index 0000000..449de8d
--- /dev/null
+++ b/ld/h8-doc.texi
@@ -0,0 +1,13 @@
+@c ------------------------------ CONFIGURATION VARS:
+@c 1. Inclusiveness of this manual
+@clear GENERIC
+
+@c 2. Specific target machines
+@set H8300
+@clear I960
+
+@c 3. Properties of this configuration
+@set SingleFormat
+@clear UsesEnvVars
+@c ------------------------------ end CONFIGURATION VARS
+