diff options
author | wlemb <wlemb> | 2002-03-23 17:14:37 +0000 |
---|---|---|
committer | wlemb <wlemb> | 2002-03-23 17:14:37 +0000 |
commit | 2524bae9f968c29059ac2f9dea277353cbc367e9 (patch) | |
tree | df06096170877906d0c4a8405b940d7b62226ef9 /Makefile.comm | |
parent | d3ee1a9bb3f7ade0b59bc6f5f20707f11ef809f8 (diff) | |
download | groff-2524bae9f968c29059ac2f9dea277353cbc367e9.tar.gz |
* Makefile.comm (.y.o): New rule for make on Solaris 2.5.1 -- the
internal .y.o rule took precendence over the .y.cc rule, compiling
the yacc files with gcc instead of g++.
* tmac/dvi.tmac: Add replacement font for `CB'.
* tmac/doc.tmac: s/request/macro/ in messages.
(doc-generic-macro): Improve error message.
* tmac/groff_mdoc.man: Minor improvements.
Diffstat (limited to 'Makefile.comm')
-rw-r--r-- | Makefile.comm | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/Makefile.comm b/Makefile.comm index 66c4b78d..291a94e3 100644 --- a/Makefile.comm +++ b/Makefile.comm @@ -112,6 +112,28 @@ extraclean: fi; \ fi +# The next rule is needed for make of Solaris 2.5.1 to override its +# built-in .y.o rule (which takes precedence over the .y.cc rule above). +.y.o: + if test -n "$(YTABH)"; then \ + $(YACC) $(YACCFLAGS) -d $<; \ + else \ + $(YACC) $(YACCFLAGS) $<; \ + fi + -test -f y.tab.h && mv y.tab.h y_tab.h + -test -f y.tab.c && mv y.tab.c y_tab.c + mv y_tab.c $(YTABC) +# Avoid ending up with two versions of $(YTABH). + if test -n "$(YTABH)"; then \ + if test -f $(srcdir)/$(YTABH); then \ + rm -f $(YTABH); \ + mv y_tab.h $(srcdir)/$(YTABH); \ + else \ + mv y_tab.h $(YTABH); \ + fi; \ + fi + $(COMPILE.cc) -o $@ $(YTABC) + version=`cat $(top_srcdir)/VERSION` # No additional number for the groff archive if revision is zero revision=`sed -e 's/^0$$//' -e 's/^[1-9].*$$/.&/' $(top_srcdir)/REVISION` |