* Makefile.in: Pass -y to bison. (Again; accidentally deleted by Rich.)

* news.sc, ldgld68k.sc:  Define __end as well as _end.

1 files changed, 99 insertions, 48 deletions

diff --git a/ld/Makefile.in b/ld/Makefile.in
index 0e052b6..6ecdade 100644
--- a/ld/Makefile.in
+++ b/ld/Makefile.in
@@ -23,12 +23,39 @@
 
 srcdir = .
 
-ddestdir = /usr/local
+prefix = /usr/local
+
+bindir = $(prefix)/bin
+datadir = $(prefix)/lib
+libdir = $(prefix)/lib
+mandir = $(datadir)/man
+man1dir = $(mandir)/man1
+man2dir = $(mandir)/man2
+man3dir = $(mandir)/man3
+man4dir = $(mandir)/man4
+man5dir = $(mandir)/man5
+man6dir = $(mandir)/man6
+man7dir = $(mandir)/man7
+man8dir = $(mandir)/man8
+man9dir = $(mandir)/man9
+infodir = $(prefix)/info
+includedir = $(prefix)/include
+docdir = $(datadir)/doc
+
+SHELL = /bin/sh
+
+INSTALL = install -c
+INSTALL_PROGRAM = $(INSTALL)
+INSTALL_DATA = $(INSTALL)
+
+AR = ar
+AR_FLAGS = qv
+BISON = bison -y
+MAKEINFO = makeinfo
+RANLIB = ranlib
 
 #version=/`$(unsubdir)/../gcc$(subdir)/gcc -dumpversion`
 version=
-bindir = $(ddestdir)/bin
-gcclibdir = $(ddestdir)/lib/gcc/$(target_alias)$(version)
 
 # Seach path to override the default search path for -lfoo libraries.
 # If LIB_PATH is empty, the ones in the script (if any) are left alone.
@@ -36,10 +63,6 @@ gcclibdir = $(ddestdir)/lib/gcc/$(target_alias)$(version)
 # which may have the form: LIB_PATH=/lib:/usr/local/lib
 LIB_PATH =
 
-INSTALL = install -c
-INSTALL_PROGRAM = $(INSTALL)
-INSTALL_FILE = $(INSTALL)
-
 BASEDIR	= ../..
 INCLUDE	= $(srcdir)/../include
 INCLUDES = -I. -I$(srcdir)  -I$(INCLUDE) 
@@ -53,17 +76,16 @@ TEXI2OPT =
 # You neeed this to generate ld-index.ms (or .mm or .me)
 # TEXI2OPT = -i
 
+TEXI2ROFF=texi2roff
+
 # Which roff program to use to generate index for texi2roff'd doc
 ROFF = groff
 
-BISON = bison
-BISONFLAGS = -v
-
 SCRIPTS = ldgld68k.sc ldgld.sc \
 	ldlnk960.sc ldlnk960r.sc ldgld960.sc \
 	i386aout.sc ldm88k.sc ldglda29k.sc news.sc h8300hds.sc ebmon29k.sc
 
-#### target and host dependent Makefile fragments come in here.
+#### Host, target, and site specific Makefile fragments come in here.
 ###
 
 CFLAGS	= $(INCLUDES) $(MINUS_G) $(HDEFINES) $(TDEFINES) $(CDEFINES)
@@ -166,7 +188,9 @@ LINTSOURCES=   $(LDCSOURCES) $(BFDSOURCES) $(GENERATED_SOURCES)
 
 STAGESTUFF = *.x *.x[ru] *.sc[ru] $(GENERATED_SOURCES) $(GENERATED_HEADERS) $(OFILES) $(LD_PROG) mkscript
 
-all: Makefile $(LD_PROG) ld.info
+all: Makefile $(LD_PROG)
+
+info: ld.info
 
 ldgram.h ldgram.c: ldgram.y
 	$(BISON) $(BISONFLAGS) -d $(VPATH)/ldgram.y
@@ -254,17 +278,32 @@ ld.dvi: $(srcdir)/ld.texinfo
 
 # info file for online browsing
 ld.info: $(srcdir)/ld.texinfo
-	- $(MAKEINFO) -o ld.info $(srcdir)/ld.texinfo
+	$(MAKEINFO) -o ld.info $(srcdir)/ld.texinfo
 
 #separate targets for "ms", "me", and "mm" forms of roff doc
-# (we don't use a variable because we don't trust all makes to handle
-# a var in the target name right).
-# roff output (-ms)
+# Try to use a recent texi2roff.  v2 was put on prep in jan91.
+# If you want an index, see texi2roff doc for postprocessing 
+# and add -i to texi2roff invocations below.
+# Workarounds for texi2roff-2 (probably fixed in later texi2roff's, delete
+#    correspondint -e lines when later texi2roff's are current)
+# + @ifinfo's deleted explicitly due to texi2roff-2 bug w nested constructs.
+# + @c's deleted explicitly because texi2roff sees texinfo commands in them
+# + @   (that's at-BLANK) not recognized by texi2roff, turned into blank
+# + @alphaenumerate is ridiculously new, turned into @enumerate
+
 ld.ms: $(srcdir)/ld.texinfo
 	sed -e '/\\input texinfo/d' \
 		-e '/@c TEXI2ROFF-KILL/,/@c END TEXI2ROFF-KILL/d' \
+		-e '/^@ifinfo/,/^@end ifinfo/d' \
+		-e '/^@c/d' \
+		-e 's/{.*,,/{/' \
+		-e 's/@ / /g' \
+		-e 's/^@alphaenumerate/@enumerate/g' \
+		-e 's/^@end alphaenumerate/@end enumerate/g' \
 		$(srcdir)/ld.texinfo | \
-	texi2roff $(TEXI2OPT) -ms >ld.ms 
+	$(TEXI2ROFF) $(TEXI2OPT) -ms | \
+	sed -e 's/---/\\(em/g' \
+		>>ld.ms 
 
 # index for roff output
 ld-index.ms: ld.ms
@@ -276,10 +315,15 @@ ld-index.ms: ld.ms
 ld.mm: $(srcdir)/ld.texinfo
 	sed -e '/\\input texinfo/d' \
 		-e '/@c TEXI2ROFF-KILL/,/@c END TEXI2ROFF-KILL/d' \
+		-e '/^@ifinfo/,/^@end ifinfo/d' \
+		-e '/^@c/d' \
 		-e 's/{.*,,/{/' \
 		-e '/@noindent/d' \
+		-e 's/@ / /g' \
+		-e 's/^@alphaenumerate/@enumerate/g' \
+		-e 's/^@end alphaenumerate/@end enumerate/g' \
 		$(srcdir)/ld.texinfo | \
-	texi2roff $(TEXI2OPT) -mm | \
+	$(TEXI2ROFF) $(TEXI2OPT) -mm | \
 	sed -e 's/---/\\(em/g' \
 	>ld.mm 
 
@@ -293,8 +337,16 @@ ld-index.mm: ld.mm
 ld.me: $(srcdir)/ld.texinfo
 	sed -e '/\\input texinfo/d' \
 		-e '/@c TEXI2ROFF-KILL/,/@c END TEXI2ROFF-KILL/d' \
+		-e '/^@ifinfo/,/^@end ifinfo/d' \
+		-e '/^@c/d' \
+		-e 's/{.*,,/{/' \
+		-e 's/@ / /g' \
+		-e 's/^@alphaenumerate/@enumerate/g' \
+		-e 's/^@end alphaenumerate/@end enumerate/g' \
 		$(srcdir)/ld.texinfo | \
-	texi2roff $(TEXI2OPT) -me >ld.me 
+	$(TEXI2ROFF) $(TEXI2OPT) -me | \
+	sed -e 's/---/\\(em/g' \
+		>>ld.me 
 
 # index for roff output
 ld-index.me: ld.me
@@ -341,19 +393,19 @@ ebmon29kr.x :ebmon29kr.sc
 ebmon29kUr.x :ebmon29kUr.sc 
 
 stage1:	force
-	- mkdir stage1
-	- mv -f $(STAGESTUFF) stage1
-	- (cd stage1 ; ln -s $(LD_PROG) ld)
+	-mkdir stage1
+	-mv -f $(STAGESTUFF) stage1
+	-(cd stage1 ; ln -s $(LD_PROG) ld)
 
 stage2:	force
-	- mkdir stage2
-	- mv -f $(STAGESTUFF) stage2
-	- (cd stage2 ; ln -s $(LD_PROG) ld)
+	-mkdir stage2
+	-mv -f $(STAGESTUFF) stage2
+	-(cd stage2 ; ln -s $(LD_PROG) ld)
 
 stage3:	force
-	- mkdir stage3
-	- mv -f $(STAGESTUFF) stage3
-	- (cd stage3 ; ln -s $(LD_PROG) ld)
+	-mkdir stage3
+	-mv -f $(STAGESTUFF) stage3
+	-(cd stage3 ; ln -s $(LD_PROG) ld)
 
 against=stage2
 
@@ -361,25 +413,25 @@ comparison: force
 	for i in $(STAGESTUFF) ; do cmp $$i $(against)/$$i ; done
 
 de-stage1: force
-	- (cd stage1 ; mv -f * ..)
-	- rm ld
-	- rmdir stage1
+	-(cd stage1 ; mv -f * ..)
+	-rm ld
+	-rmdir stage1
 
 de-stage2: force
-	- (cd stage2 ; mv -f * ..)
-	- rm ld
-	- rmdir stage2
+	-(cd stage2 ; mv -f * ..)
+	-rm ld
+	-rmdir stage2
 
 de-stage3: force
-	- (cd stage3 ; mv -f * ..)
-	- rm ld
-	- rmdir stage3
+	-(cd stage3 ; mv -f * ..)
+	-rm ld
+	-rmdir stage3
 
 clean:
-	- rm -f TAGS $(OFILES) $(GENERATED_SOURCES) $(GENERATED_HEADERS)
-	- rm -f *.x *.x[runN] *.sc[runN]
-	- rm -f ld.?? ld.???
-	- rm -f ld ld1 ld2 ld3 ld.new mkscript *.o y.output
+	-rm -f TAGS $(OFILES) $(GENERATED_SOURCES) $(GENERATED_HEADERS)
+	-rm -f *.x *.x[runN] *.sc[runN]
+	-rm -f ld.?? ld.???
+	-rm -f ld ld1 ld2 ld3 ld.new mkscript *.o y.output
 
 lintlog:$(SOURCES) Makefile
 	$(LINT) -abhxzn  $(LINTFLAGS)  $(LINTSOURCES) \
@@ -400,13 +452,12 @@ tags TAGS:$(SOURCES) $(HEADERS)
 objdump:objdump.c 
 
 install: $(LD_PROG)
-	$(INSTALL_PROGRAM) ld.new $(ddestdir)/bin/ld
-	$(INSTALL_PROGRAM) ld.new $(gcclibdir)/ld
+	$(INSTALL_PROGRAM) ld.new $(bindir)/ld
+#	$(INSTALL_PROGRAM) ld.new $(gcclibdir)/ld
+
+install-info: info
 	for i in ld.info* ; do \
-		echo Installing $$i... ; \
-		(cp $$i $(idestdir)/info/$$i.new \
-			&& mv -f $(idestdir)/info/$$i.new $(idestdir)/info/$$i) \
-		|| exit 1 ; \
+		$(INSTALL_DATA) $$i $(infodir)/$$i ; \
 	done
 
 # Something like the following might make sense for install, but doesn't work
@@ -479,8 +530,8 @@ make:
 Makefile: $(srcdir)/Makefile.in $(host_makefile_frag) $(target_makefile_frag)
 	$(SHELL) ./config.status
 
-### Local Variables: ***
 ### mode:fundamental ***
+### Local Variables: ***
 ### page-delimiter: "^#" ***
 ### End: ***
 ### end of file