Changeset d11f684 in git


Ignore:
Timestamp:
21/09/11 01:08:20 (8 years ago)
Author:
Olly Betts <olly@…>
Branches:
svn/1.0, svn/tags/1.0.40
Children:
d9f8c1c
Parents:
08c50e5
Message:

doc/Makefile.am: Factor out DOCBOOK_TO_MAN and SGMLTOOLS to reduce
differences with trunk.

git-svn-id: file:///home/survex-svn/survex/branches/1.0@3727 4b37db11-9a0c-4f06-9ece-9ab7cdaee568

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • ChangeLog

    r08c50e5 rd11f684  
     1Wed Sep 21 00:07:52 GMT 2011  Olly Betts <olly@survex.com>
     2
     3        * doc/Makefile.am: Factor out DOCBOOK_TO_MAN and SGMLTOOLS to reduce
     4          differences with trunk.
     5
    16Wed Sep 21 00:03:36 GMT 2011  Olly Betts <olly@survex.com>
    27
  • doc/Makefile.am

    r08c50e5 rd11f684  
    22
    33pkgdocdir = @PKGDOCDIR@
     4
     5DOCBOOK_TO_MAN = docbook-to-man
     6SGMLTOOLS = @sgmltools@
    47
    58other_mans = cad3d.1 cavern.1 diffpos.1 extend.1 sorterr.1 3dtopos.1 \
     
    4144
    4245aven.1: $(srcdir)/aven.sgml $(srcdir)/man_aven.sgml $(srcdir)/survex.ent
    43         docbook-to-man $(srcdir)/man_aven.sgml > aven.tmp
     46        $(DOCBOOK_TO_MAN) $(srcdir)/man_aven.sgml > aven.tmp
    4447        mv aven.tmp aven.1
    4548
    4649cad3d.1: $(srcdir)/cad3d.sgml $(srcdir)/man_cad3d.sgml $(srcdir)/survex.ent
    47         docbook-to-man $(srcdir)/man_cad3d.sgml > cad3d.tmp
     50        $(DOCBOOK_TO_MAN) $(srcdir)/man_cad3d.sgml > cad3d.tmp
    4851        mv cad3d.tmp cad3d.1
    4952
    5053cavern.1: $(srcdir)/cavern.sgml $(srcdir)/man_cavern.sgml $(srcdir)/survex.ent
    51         docbook-to-man $(srcdir)/man_cavern.sgml > cavern.tmp
     54        $(DOCBOOK_TO_MAN) $(srcdir)/man_cavern.sgml > cavern.tmp
    5255        mv cavern.tmp cavern.1
    5356
    5457caverot.1: $(srcdir)/caverot.sgml $(srcdir)/man_caverot.sgml $(srcdir)/survex.ent
    55         docbook-to-man $(srcdir)/man_caverot.sgml > caverot.tmp
     58        $(DOCBOOK_TO_MAN) $(srcdir)/man_caverot.sgml > caverot.tmp
    5659        mv caverot.tmp caverot.1
    5760
    5861diffpos.1: $(srcdir)/diffpos.sgml $(srcdir)/man_diffpos.sgml $(srcdir)/survex.ent
    59         docbook-to-man $(srcdir)/man_diffpos.sgml > diffpos.tmp
     62        $(DOCBOOK_TO_MAN) $(srcdir)/man_diffpos.sgml > diffpos.tmp
    6063        mv diffpos.tmp diffpos.1
    6164
    6265extend.1: $(srcdir)/extend.sgml $(srcdir)/man_extend.sgml $(srcdir)/survex.ent
    63         docbook-to-man $(srcdir)/man_extend.sgml > extend.tmp
     66        $(DOCBOOK_TO_MAN) $(srcdir)/man_extend.sgml > extend.tmp
    6467        mv extend.tmp extend.1
    6568
    6669printdm.1: $(srcdir)/printdm.sgml $(srcdir)/man_printdm.sgml $(srcdir)/survex.ent
    67         docbook-to-man $(srcdir)/man_printdm.sgml > printdm.tmp
     70        $(DOCBOOK_TO_MAN) $(srcdir)/man_printdm.sgml > printdm.tmp
    6871        mv printdm.tmp printdm.1
    6972
    7073printhpgl.1: $(srcdir)/printhpgl.sgml $(srcdir)/man_printhpgl.sgml $(srcdir)/survex.ent
    71         docbook-to-man $(srcdir)/man_printhpgl.sgml > printhpgl.tmp
     74        $(DOCBOOK_TO_MAN) $(srcdir)/man_printhpgl.sgml > printhpgl.tmp
    7275        mv printhpgl.tmp printhpgl.1
    7376
    7477printpcl.1: $(srcdir)/printpcl.sgml $(srcdir)/man_printpcl.sgml $(srcdir)/survex.ent
    75         docbook-to-man $(srcdir)/man_printpcl.sgml > printpcl.tmp
     78        $(DOCBOOK_TO_MAN) $(srcdir)/man_printpcl.sgml > printpcl.tmp
    7679        mv printpcl.tmp printpcl.1
    7780
    7881printps.1: $(srcdir)/printps.sgml $(srcdir)/man_printps.sgml $(srcdir)/survex.ent
    79         docbook-to-man $(srcdir)/man_printps.sgml > printps.tmp
     82        $(DOCBOOK_TO_MAN) $(srcdir)/man_printps.sgml > printps.tmp
    8083        mv printps.tmp printps.1
    8184
    8285sorterr.1: $(srcdir)/sorterr.sgml $(srcdir)/man_sorterr.sgml $(srcdir)/survex.ent
    83         docbook-to-man $(srcdir)/man_sorterr.sgml > sorterr.tmp
     86        $(DOCBOOK_TO_MAN) $(srcdir)/man_sorterr.sgml > sorterr.tmp
    8487        mv sorterr.tmp sorterr.1
    8588
    86893dtopos.1: $(srcdir)/3dtopos.sgml $(srcdir)/man_3dtopos.sgml $(srcdir)/survex.ent
    87         docbook-to-man $(srcdir)/man_3dtopos.sgml > 3dtopos.tmp
     90        $(DOCBOOK_TO_MAN) $(srcdir)/man_3dtopos.sgml > 3dtopos.tmp
    8891        mv 3dtopos.tmp 3dtopos.1
    8992
    9093xcaverot.1: $(srcdir)/xcaverot.sgml $(srcdir)/man_xcaverot.sgml $(srcdir)/survex.ent
    91         docbook-to-man $(srcdir)/man_xcaverot.sgml > xcaverot.tmp
     94        $(DOCBOOK_TO_MAN) $(srcdir)/man_xcaverot.sgml > xcaverot.tmp
    9295        mv xcaverot.tmp xcaverot.1
    9396
    9497svxedit.1: $(srcdir)/svxedit.sgml $(srcdir)/man_svxedit.sgml $(srcdir)/survex.ent
    95         docbook-to-man $(srcdir)/man_svxedit.sgml > svxedit.tmp
     98        $(DOCBOOK_TO_MAN) $(srcdir)/man_svxedit.sgml > svxedit.tmp
    9699        mv svxedit.tmp svxedit.1
    97100
    98101print.ini.5: $(srcdir)/print.ini.sgml $(srcdir)/man_print.ini.sgml $(srcdir)/survex.ent
    99         docbook-to-man $(srcdir)/man_print.ini.sgml > print.ini.tmp
     102        $(DOCBOOK_TO_MAN) $(srcdir)/man_print.ini.sgml > print.ini.tmp
    100103        mv print.ini.tmp print.ini.5
    101104
     
    124127manual: manual/stampfile
    125128manual/stampfile: $(manual_sources) custom.dsl survex.ent ../configure.in
    126         @sgmltools@ --backend=html --dsssl-spec='custom.dsl#html' manual.sgml
     129        $(SGMLTOOLS) --backend=html --dsssl-spec='custom.dsl#html' manual.sgml
    127130        cp caution.png note.png manual
    128131        touch manual/stampfile
    129132
     133manual.txt: $(manual_sources) survex.ent ../configure.in
     134        $(SGMLTOOLS) --backend=txt manual.sgml
     135
    130136# this rule is not used by the build system - it's for "manual" use (ho ho)
    131137manual.html: $(manual_sources) custom.dsl survex.ent ../configure.in
    132         @sgmltools@ --backend=onehtml \
     138        $(SGMLTOOLS) --backend=onehtml \
    133139                --dsssl-spec='custom.dsl#onehtml' manual.sgml
    134140
    135141manual.rtf: $(manual_sources) survex.ent ../configure.in
    136         @sgmltools@ --backend=rtf manual.sgml
    137 
    138 manual.txt: $(manual_sources) survex.ent ../configure.in
    139         @sgmltools@ --backend=txt manual.sgml
     142        $(SGMLTOOLS) --backend=rtf manual.sgml
    140143
    141144manual.ps: $(manual_sources) survex.ent ../configure.in
    142         @sgmltools@ --backend=ps manual.sgml
     145        $(SGMLTOOLS) --backend=ps manual.sgml
    143146
    144147CLEANFILES = usr
Note: See TracChangeset for help on using the changeset viewer.