diff options
| author | Ingo Schwarze <schwarze@openbsd.org> | 2022-04-03 00:39:34 +0200 |
|---|---|---|
| committer | Ingo Schwarze <schwarze@openbsd.org> | 2022-04-03 00:47:15 +0200 |
| commit | 6bdf48eb6755b429aa82c9c5c532bd4339c1deb1 (patch) | |
| tree | 9dbf7206547262002ebb8c785f36a0618403da1a /contrib/sboxes | |
| parent | 37cacdc36cc9cdcc1025144236f9734621aa99ae (diff) | |
| download | groff-git-6bdf48eb6755b429aa82c9c5c532bd4339c1deb1.tar.gz | |
msboxes.ms is documentation, not merely an example
Consequently, install msboxes.ms unconditionally and msboxes.pdf
if BUILD_PDFDOC is enabled, both to the documentation directory
rather than to the examples directory.
While here,
* garbage collect the redundant variable SBOXES_NORMAL_FILES
* assign to EXTRA_DIST in one place, not two
* move the msboxes.pdf prerequisites to the right place
since building msboxes.ms does not need them
OK gbranden@
Diffstat (limited to 'contrib/sboxes')
| -rw-r--r-- | contrib/sboxes/ChangeLog | 7 | ||||
| -rw-r--r-- | contrib/sboxes/sboxes.am | 30 |
2 files changed, 21 insertions, 16 deletions
diff --git a/contrib/sboxes/ChangeLog b/contrib/sboxes/ChangeLog index 3aafda5ec..86f6999d8 100644 --- a/contrib/sboxes/ChangeLog +++ b/contrib/sboxes/ChangeLog @@ -1,3 +1,10 @@ +2022-04-03 Ingo Schwarze <schwarze@openbsd.org> + + * sboxes.am: msboxes.ms is documentation, not merely an example. + Consequently, install msboxes.ms unconditionally and msboxes.pdf + if BUILD_PDFDOC is enabled, both to the documentation directory + rather than to the examples directory. + 2022-04-02 Ingo Schwarze <schwarze@openbsd.org> * sboxes.am: Stop installing msboxes.ms.in; diff --git a/contrib/sboxes/sboxes.am b/contrib/sboxes/sboxes.am index f3fb63dba..b12c9369d 100644 --- a/contrib/sboxes/sboxes.am +++ b/contrib/sboxes/sboxes.am @@ -20,31 +20,28 @@ sboxes_srcdir = $(top_srcdir)/contrib/sboxes sboxes_builddir = $(top_builddir)/contrib/sboxes sboxesnotquine = $(sboxes_srcdir)/notquine.sed -# Files installed in $(tmacdir). -SBOXES_NORMAL_FILES = contrib/sboxes/sboxes.tmac + sboxestmacdir = $(tmacdir) -dist_sboxestmac_DATA = $(SBOXES_NORMAL_FILES) +dist_sboxestmac_DATA = contrib/sboxes/sboxes.tmac EXTRA_DIST += \ contrib/sboxes/ChangeLog \ + contrib/sboxes/msboxes.ms.in \ contrib/sboxes/notquine.sed SBOXES_EXAMPLEFILES = $(sboxes_srcdir)/msboxes.ms.in -if BUILD_EXAMPLES -sboxesexampledir = $(exampledir)/sboxes -SBOXES_PROCESSEDEXAMPLEFILES = $(sboxes_builddir)/msboxes.ms \ - $(sboxes_builddir)/msboxes.pdf -sboxesprocessedexampledir = $(exampledir)/sboxes -nodist_sboxesprocessedexample_DATA = $(SBOXES_PROCESSEDEXAMPLEFILES) + +sboxesotherdocdir = $(docdir) +nodist_sboxesotherdoc_DATA = $(sboxes_builddir)/msboxes.ms + +if BUILD_PDFDOC +sboxespdfdocdir = $(pdfdocdir) +nodist_sboxespdfdoc_DATA = $(sboxes_builddir)/msboxes.pdf endif -EXTRA_DIST += \ - contrib/sboxes/msboxes.ms.in MOSTLYCLEANFILES += msboxes.ms \ - $(SBOXES_PROCESSEDEXAMPLEFILES) - -$(SBOXES_PROCESSEDEXAMPLEFILES): $(SBOXES_NORMAL_FILES) \ - groff troff gropdf font/devpdf/build_font_files + $(nodist_sboxesotherdoc_DATA) \ + $(nodist_sboxespdfdoc_DATA) # The ordering of the sed -e expressions is important. $(sboxes_builddir)/msboxes.ms: $(SBOXES_EXAMPLEFILES) $(sboxesnotquine) @@ -57,7 +54,8 @@ $(sboxes_builddir)/msboxes.ms: $(SBOXES_EXAMPLEFILES) $(sboxesnotquine) $(SBOXES_EXAMPLEFILES) >> $@.tmp $(AM_V_GEN)mv $@.tmp $@ -$(sboxes_builddir)/msboxes.pdf: $(sboxes_builddir)/msboxes.ms +$(sboxes_builddir)/msboxes.pdf: $(sboxes_builddir)/msboxes.ms \ + $(dist_sboxestmac_DATA) groff troff gropdf font/devpdf/build_font_files $(GROFF_V)$(DOC_GROFF_ONLY) -M$(sboxes_srcdir) -ms -msboxes -Tpdf \ $(sboxes_builddir)/msboxes.ms > $@ |