diff options
| author | wlemb <wlemb> | 2000-10-23 06:19:10 +0000 |
|---|---|---|
| committer | wlemb <wlemb> | 2000-10-23 06:19:10 +0000 |
| commit | 97787b104a5c18121415b1df115b33e2f074e3b9 (patch) | |
| tree | ee8bea98e8e541f0d4ef29c560a239a19f1074a7 /Makefile.in | |
| parent | ca467670909e8af66bfdad7600fadec77486ddfd (diff) | |
| download | groff-97787b104a5c18121415b1df115b33e2f074e3b9.tar.gz | |
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.
* NEWS, src/roff/nroff/nroff.man, src/roff/groff/groff.man,
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 25 |
1 files changed, 14 insertions, 11 deletions
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 |