* Makefile.comm (CLEANNOTSRCDIRADD): New target for files which

should be removed only if builddir is not srcdir.
(mostlyclean): Handle `CLEANNOTSRCDIRADD'.
(clean): Depend on `mostlyclean'.
(distclean): Depend on `clean'.
(realclean, extraclean): Depend on `distclean'.
(.y.cc, .y.o): Simplified.  The output files are no longer written
to srcdir but to builddir.
* Makefile.in (MDEFINES): Add `version' and `revision'.
(uninstall_dirs): Fix order of directories.
* doc/Makefile.sub (version, revision): Removed.
(CLEANADD): Removed grnexmpl.g, groff, groff-*.
Added `HTMLDOCFILES'.
(CLEANNOTSRCDIRADD): New target for grnexmpl.h, groff, groff-*.
* contrib/mom/Makefile.sub (uninstall_sub): Don't use `momdocdir'
but `htmldocdir'.
Add missing backslash.
* src/preproc/eqn/Makefile.sub, src/preproc/pic/Makefile.sub,
src/preproc/refer/Makefile.sub (YTABC, YTABH): Don't use `srcdir'
as prefix.

* doc/texinfo.tex (\authortt): New macro.
(\shortcontt): Define.
(\titlepage): Set \tt to \authortt while defining \authorfont.
(\appendixbox): New macro.
(\chapmacro, \appendixentry): Use \appendixbox to get even
indentation for letters.
(\summarycontents): Set \tt.
(\internalpagesize): Add two arguments for real paper width and
height as needed by pdfTeX.
(\letterpaper, \smallbook, \afourpaper, \afivepaper, \afourlatex):
Updated.
(\tempdima, \tempdimb): New temporary dimensions.
(\pagesizesyyy): Updated.

1 files changed, 24 insertions, 35 deletions

diff --git a/Makefile.comm b/Makefile.comm
index b2fec5ee..c86aa4c0 100644
--- a/Makefile.comm
+++ b/Makefile.comm
@@ -1,4 +1,4 @@
-# Copyright (C) 1989-2000 Free Software Foundation, Inc.
+# Copyright (C) 1989-2000, 2002 Free Software Foundation, Inc.
 #      Written by James Clark (jjc@jclark.com)
 # 
 # This file is part of groff.
@@ -39,6 +39,7 @@ GRAM=
 LIBCLEAN=
 CLEANADD=
 CLEANDIRADD=
+CLEANNOTSRCDIRADD=
 MOSTLYCLEANFILES=$(MANCLEAN) $(PROG) $(OBJS) $(GENSRCS) $(GENHDRS) \
   depend.temp core y.output $(CLEANADD)
 CLEANFILES=$(LIBCLEAN)
@@ -71,20 +72,28 @@ prefix_must_exist:
 mostlyclean:
 	-rm -f $(MOSTLYCLEANFILES)
 	-rm -rf $(CLEANDIRADD)
+	-@if test `cd $(srcdir); pwd` = `pwd`; then \
+	  :; \
+	else \
+	  rm -f $(CLEANNOTSRCDIRADD); \
+	fi
 
-clean:
-	-rm -f $(CLEANFILES) $(MOSTLYCLEANFILES)
+clean: mostlyclean
+	-rm -f $(CLEANFILES)
 
-distclean:
-	-rm -f $(DISTCLEANFILES) $(CLEANFILES) $(MOSTLYCLEANFILES)
+distclean: clean
+	-rm -f $(DISTCLEANFILES)
+	-@if test `cd $(srcdir); pwd` = `pwd`; then \
+	  :; \
+	else \
+	  rm -f $(YTABC) $(YTABH); \
+	fi
 
-realclean:
-	-rm -f $(REALCLEANFILES) $(DISTCLEANFILES) $(CLEANFILES) \
-	  $(MOSTLYCLEANFILES)
+realclean: distclean
+	-rm -f $(REALCLEANFILES)
 
-extraclean:
-	-rm -f $(DISTCLEANFILES) $(CLEANFILES) $(MOSTLYCLEANFILES) \
-	  \#* *~ =* core junk grot old temp tmp tem
+extraclean: distclean
+	-rm -f \#* *~ =* core junk grot old temp tmp tem
 
 .SUFFIXES:
 .SUFFIXES: .o .cc .c .y .man .n
@@ -103,16 +112,8 @@ extraclean:
 	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 $@
-# 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
+	mv y_tab.c $(YTABC)
+	if test -n "$(YTABH)"; then mv y_tab.h $(YTABH); 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).
@@ -125,20 +126,8 @@ extraclean:
 	-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`
+	if test -n "$(YTABH)"; then mv y_tab.h $(YTABH); fi
+	$(COMPILE.cc) $(YTABC)
 
 .man.n:
 	@echo Making $@ from $<