diff options
| -rw-r--r-- | ChangeLog | 18 | ||||
| -rw-r--r-- | Makefile.comm | 1 | ||||
| -rw-r--r-- | Makefile.in | 25 | ||||
| -rw-r--r-- | NEWS | 8 | ||||
| -rwxr-xr-x | doc/Makefile | 2 | ||||
| -rw-r--r-- | src/roff/troff/Makefile.sub | 10 | ||||
| -rw-r--r-- | src/utils/indxbib/Makefile.sub | 1 | ||||
| -rw-r--r-- | src/xditview/Imakefile.in | 9 | ||||
| -rw-r--r-- | tmac/Makefile.sub | 2 |
9 files changed, 50 insertions, 26 deletions
@@ -1,3 +1,19 @@ +2000-10-23 Werner LEMBERG <wl@gnu.org> + + Move hyphen.us to tmac directory. + + * src/roff/troff/hyphen.us: Removed. + * src/tmac/hyphen.us: Added. + * src/roff/troff/Makefile.sub, tmac/Makefile.sub: Updated. + + Change installation structure for data files from .../groff/... to + .../groff/<version><revision>/... to be conform with other GNU + programs. + + * Makefile.in, Makefile.comm, src/utils/indxbib/Makefile.sub, + doc/Makefile, src/xditview/Imakefile.in: Implement it. + * NEWS: Document it. + 2000-10-22 Werner LEMBERG <wl@gnu.org> Implement $GROFF_BIN_PATH environment variable (which defaults to @@ -13,7 +29,7 @@ $GROFF_PATH__ (the latter for communication with troff). * src/roff/troff/input.cc (main): Use $GROFF_PATH__ for $PATH if set. - * src/roff/nroff/nroff.man, src/roff/groff/groff.man, + * NEWS, src/roff/nroff/nroff.man, src/roff/groff/groff.man, doc/groff.texinfo: Document it. * doc/groff.texinfo: Improve documentation of troff's -a option. diff --git a/Makefile.comm b/Makefile.comm index 3240f1dd..6aec3d92 100644 --- a/Makefile.comm +++ b/Makefile.comm @@ -206,6 +206,7 @@ uninstall_prog: .PHONY: install_dev install_dev: -test -d $(datadir) || $(mkinstalldirs) $(datadir) + -test -d $(dataprogramdir) || $(mkinstalldirs) $(dataprogramdir) -test -d $(datasubdir) || $(mkinstalldirs) $(datasubdir) -test -d $(fontdir) || $(mkinstalldirs) $(fontdir) -test -d $(fontsubdir) || $(mkinstalldirs) $(fontsubdir) diff --git a/Makefile.in b/Makefile.in index 8186bba5..bf1ffd3b 100644 --- a/Makefile.in +++ b/Makefile.in @@ -17,6 +17,15 @@ # with groff; see the file COPYING. If not, write to the Free Software # Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +srcdir=@srcdir@ +top_srcdir=@top_srcdir@ +VPATH=@srcdir@ +top_builddir=@top_builddir@ + +version=`cat $(top_srcdir)/VERSION` +# No additional number if revision is zero +revision=`sed -e 's/^0$$//' -e 's/^[1-9].*$$/.&/' $(top_srcdir)/REVISION` + # Define `page' to be letter if your PostScript printer uses 8.5x11 # paper (USA) and define it to be A4, if it uses A4 paper (rest of the # world). @@ -79,7 +88,8 @@ bindir=$(exec_prefix)/bin # datasubdir says where to install data files datadir=@datadir@ -datasubdir=$(datadir)/groff +dataprogramdir=$(datadir)/groff +datasubdir=$(dataprogramdir)/$(version)$(revision) # fontdir says where to install dev*/*. fontdir=$(datasubdir)/font @@ -225,11 +235,6 @@ PERLPATH=@PERLPATH@ # Sed command with which to edit sh scripts. SH_SCRIPT_SED_CMD=@SH_SCRIPT_SED_CMD@ -srcdir=@srcdir@ -top_srcdir=@top_srcdir@ -VPATH=@srcdir@ -top_builddir=@top_builddir@ - # the program to create directory hierarchies mkinstalldirs=$(top_srcdir)/mkinstalldirs @@ -255,6 +260,7 @@ MDEFINES= \ "exec_prefix=$(exec_prefix)" \ "g=$(g)" \ "datadir=$(datadir)" \ + "dataprogramdir=$(dataprogramdir)" \ "datasubdir=$(datasubdir)" \ "bindir=$(bindir)" \ "fontdir=$(fontdir)" \ @@ -464,10 +470,6 @@ $(INCDIRS) $(OTHERDIRS): FORCE -f $$srcdir/Makefile.sub \ -f $(top_srcdir)/Makefile.man $(do) -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` - .PHONY: dist dist: -rm -fr tmp @@ -521,7 +523,8 @@ uninstall: uninstall_sub uninstall_dirs uninstall_dirs: # Use rmdir here so that the directories are only removed if they're empty -rmdir $(man1dir) $(man5dir) $(man7dir) $(manroot) \ - $(tmacdir) $(fontdir) $(bindir) $(datasubdir) $(datadir) + $(tmacdir) $(fontdir) $(bindir) \ + $(datasubdir) $(dataprogramdir) $(datadir) .PHONY: check @@ -8,6 +8,11 @@ To support platforms with 8+3 filenames, `-mFOO' will now search first for tmac.FOO and then for FOO.tmac. Additionally, some macro files have been renamed using the latter scheme to avoid 8+3 name clashes. +The new environment variable GROFF_BIN_PATH will be checked for programs +groff is calling (preprocessors, troff, and output devices). If not set, +it defaults to the directory where the groff binary is located. Previously, +it was PATH. This is also true for the nroff script. + Troff ----- @@ -56,6 +61,9 @@ For security reasons the following changes have been done: safer mode (which is the default); to use these requests the `-U' command line flag must be used. +groff will now install its data files into /usr/local/share/groff/<version> +by default, following the GNU standard. + VERSION 1.16.1 ============== diff --git a/doc/Makefile b/doc/Makefile index 042bbe05..57abf327 100755 --- a/doc/Makefile +++ b/doc/Makefile @@ -26,7 +26,7 @@ MEMACROS=../tmac/tmac.e SOELIM=../src/preproc/soelim/soelim version=`cat ../VERSION` -# No additional number for the groff archive if revision is zero +# No additional number if revision is zero revision=`sed -e 's/^0$$//' -e 's/^[1-9].*$$/.&/' ../REVISION` all: $(DOCS) diff --git a/src/roff/troff/Makefile.sub b/src/roff/troff/Makefile.sub index 342ad595..ac181f38 100644 --- a/src/roff/troff/Makefile.sub +++ b/src/roff/troff/Makefile.sub @@ -45,13 +45,3 @@ majorminor.cc: $(top_srcdir)/VERSION $(top_srcdir)/REVISION @echo const char \*minor_version = \ \"`sed -e 's/^[^.]*\.\([0-9]*\).*$$/\1/' $(top_srcdir)/VERSION`\"\; >>$@ @echo const char \*revision = \"`cat $(top_srcdir)/REVISION`\"\; >>$@ - -install_data: hyphen.us - -test -d $(datadir) || $(mkinstalldirs) $(datadir) - -test -d $(datasubdir) || $(mkinstalldirs) $(datasubdir) - -test -d $(tmacdir) || $(mkinstalldirs) $(tmacdir) - -rm -f $(tmacdir)/hyphen.us - $(INSTALL_DATA) $(srcdir)/hyphen.us $(tmacdir)/hyphen.us - -uninstall_sub: - -rm -f $(tmacdir)/hyphen.us diff --git a/src/utils/indxbib/Makefile.sub b/src/utils/indxbib/Makefile.sub index 2c50e659..add99eba 100644 --- a/src/utils/indxbib/Makefile.sub +++ b/src/utils/indxbib/Makefile.sub @@ -15,6 +15,7 @@ NAMEPREFIX=$(g) install_data: eign -test -d $(datadir) || $(mkinstalldirs) $(datadir) + -test -d $(dataprogramdir) || $(mkinstalldirs) $(dataprogramdir) -test -d $(datasubdir) || $(mkinstalldirs) $(datasubdir) if test -f /usr/lib/eign; then \ rm -f $(common_words_file); \ diff --git a/src/xditview/Imakefile.in b/src/xditview/Imakefile.in index a7202056..a2d42920 100644 --- a/src/xditview/Imakefile.in +++ b/src/xditview/Imakefile.in @@ -3,10 +3,15 @@ top_srcdir=@top_srcdir@ VPATH=@srcdir@ top_builddir=@top_builddir@ +version=`cat $(top_srcdir)/VERSION` +# No additional number if revision is zero +revision=`sed -e 's/^0$$//' -e 's/^[1-9].*$$/.&/' $(top_srcdir)/REVISION` + GROFF_PREFIX = @prefix@ GROFF_DATADIR = $(GROFF_PREFIX)/share -GROFF_LIBDIR = $(GROFF_DATADIR)/groff -GROFF_FONTDIR = $(GROFF_LIBDIR)/font +GROFF_DATAPROGRAMDIR = $(GROFF_DATADIR)/share +GROFF_DATASUBDIR = $(GROFF_DATAPROGRAMDIR)/$(version)$(revision) +GROFF_FONTDIR = $(GROFF_DATASUBDIR)/font GROFF_FONTPATH = .:$(GROFF_FONTDIR):/usr/local/lib/font:/usr/lib/font DPIS = 75 100 diff --git a/tmac/Makefile.sub b/tmac/Makefile.sub index b1b50d3d..0a67ef12 100644 --- a/tmac/Makefile.sub +++ b/tmac/Makefile.sub @@ -13,7 +13,7 @@ NORMALFILES=\ tmac.psatk tmac.dvi tmac.tty tmac.tty-char tmac.X tmac.Xps tmac.latin1 \ tmac.lj4 eqnrc troffrc troffrc-end tmac.html tmac.html2 \ tmac.html-tags tmac.markup tmac.arkup tmac.a4 tmac.trace tmac.me \ - tmac.mdoc tmac.an.old + tmac.mdoc tmac.an.old hyphen.us SPECIALFILES=tmac.an tmac.s tmac.man tmac.ms STRIPFILES=tmac.e tmac.doc tmac.doc.old MDOCFILES=doc-common doc-ditroff doc-nroff doc-syms |