summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorIngo Schwarze <schwarze@openbsd.org>2022-04-12 14:36:12 +0200
committerIngo Schwarze <schwarze@openbsd.org>2022-04-15 13:11:30 +0200
commit3805d2a0e4aebb84d896f86285fd565488e849bb (patch)
treeef0f89a6097a95a631a01d11fda7bb2bdcbdaab8 /contrib
parent876f3b98e164816e1b1ed8ce9ca9f65d1c095fce (diff)
downloadgroff-git-3805d2a0e4aebb84d896f86285fd565488e849bb.tar.gz
[configure] Delete the --with-doc option.
This option was harmful, ill-designed, buggy, and essentially unmaintained and untested. For more details on the rationale, see the NEWS file. OK gbranden@ and no objection when shown on groff at gnu dot org.
Diffstat (limited to 'contrib')
-rw-r--r--contrib/chem/ChangeLog8
-rw-r--r--contrib/chem/chem.am6
-rw-r--r--contrib/hdtbl/ChangeLog8
-rw-r--r--contrib/hdtbl/hdtbl.am8
-rw-r--r--contrib/mom/ChangeLog9
-rw-r--r--contrib/mom/mom.am10
6 files changed, 28 insertions, 21 deletions
diff --git a/contrib/chem/ChangeLog b/contrib/chem/ChangeLog
index 7f857757a..e40f5dfa7 100644
--- a/contrib/chem/ChangeLog
+++ b/contrib/chem/ChangeLog
@@ -1,3 +1,11 @@
+2022-04-12 Ingo Schwarze <schwarze@openbsd.org>
+
+ Delete the harmful, ill-designed, buggy, and essentially
+ unmaintained and untested --with-doc option of the configure
+ script. See the NEWS file for more details on the rationale.
+
+ * chem.am: Delete three BUILD_EXAMPLES conditionals.
+
2020-04-22 G. Branden Robinson <g.branden.robinson@gmail.com>
* chem.1.man:
diff --git a/contrib/chem/chem.am b/contrib/chem/chem.am
index 148ae171c..01d82db41 100644
--- a/contrib/chem/chem.am
+++ b/contrib/chem/chem.am
@@ -38,7 +38,6 @@ CHEM_EXAMPLES = \
contrib/chem/examples/penicillin.chem \
contrib/chem/examples/reserpine.chem
-if BUILD_EXAMPLES
# Files installed in $(exampledir)/chem
chemexampledir = $(exampledir)/chem
nodist_chemexample_DATA = $(CHEM_GENEXAMPLES)
@@ -48,7 +47,6 @@ dist_chemexample_DATA = $(CHEM_EXAMPLES)
# lazily installed by the local install target
chemexample122dir = $(chemexampledir)/122
nodist_chemexample122_DATA = contrib/chem/examples/122/README
-endif
EXTRA_DIST += \
contrib/chem/ChangeLog \
contrib/chem/chem.1.man \
@@ -92,23 +90,19 @@ chem: $(chem_srcdir)/chem.pl $(SH_DEPS_SED_SCRIPT)
install-data-local: install_chem_extra
install_chem_extra:
-if BUILD_EXAMPLES
-test -d $(DESTDIR)$(chemexample122dir) \
|| $(mkinstalldirs) $(DESTDIR)$(chemexample122dir);
for i in $(chem_srcdir)/examples/122/*.chem; do \
n=`echo $$i | sed 's|$(chem_srcdir)/examples/122/||g'`; \
$(INSTALL_DATA) $$i $(DESTDIR)$(chemexample122dir)/$$n; \
done
-endif
uninstall-local: uninstall_chem_extra
uninstall_chem_extra:
-if BUILD_EXAMPLES
$(RM) $(DESTDIR)$(exampledir)/chem/122/*
-rmdir $(DESTDIR)$(exampledir)/chem/122
$(RM) $(DESTDIR)$(exampledir)/chem/*
-rmdir $(DESTDIR)$(exampledir)/chem
-endif
-rmdir $(DESTDIR)$(datasubdir)/pic
dist-hook: dist_chem
diff --git a/contrib/hdtbl/ChangeLog b/contrib/hdtbl/ChangeLog
index 12de4fecf..a66ef7617 100644
--- a/contrib/hdtbl/ChangeLog
+++ b/contrib/hdtbl/ChangeLog
@@ -1,3 +1,11 @@
+2022-04-12 Ingo Schwarze <schwarze@openbsd.org>
+
+ Delete the harmful, ill-designed, buggy, and essentially
+ unmaintained and untested --with-doc option of the configure
+ script. See the NEWS file for more details on the rationale.
+
+ * hdtbl.am: Delete two BUILD_EXAMPLES conditionals.
+
2022-03-30 G. Branden Robinson <g.branden.robinson@gmail.com>
* hdtbl.am: Eliminate `HDTBL_TFLAG` and `HDTBL_PFLAG` Make
diff --git a/contrib/hdtbl/hdtbl.am b/contrib/hdtbl/hdtbl.am
index 2c10dc6a6..19af0ea2b 100644
--- a/contrib/hdtbl/hdtbl.am
+++ b/contrib/hdtbl/hdtbl.am
@@ -75,16 +75,12 @@ HDTBLPROCESSEDEXAMPLEFILES = \
contrib/hdtbl/examples/short_reference.ps
hdtblexampledir = $(exampledir)/hdtbl
-
-if BUILD_EXAMPLES
dist_hdtblexample_DATA = $(HDTBLEXAMPLEFILES)
nodist_hdtblexample_DATA = \
$(HDTBLGENFILES) \
$(HDTBLPROCESSEDEXAMPLEFILES) \
$(DOC_GNU_EPS)
-else
-EXTRA_DIST += $(HDTBLEXAMPLEFILES)
-endif
+
$(hdtblexample_DATA): $(HDTBLTMACFILES)
MOSTLYCLEANFILES += $(HDTBLGENFILES) $(HDTBLPROCESSEDEXAMPLEFILES)
@@ -94,7 +90,6 @@ EXTRA_DIST += \
contrib/hdtbl/TODO \
contrib/hdtbl/groff_hdtbl.7.man
-if BUILD_EXAMPLES
hdtbl_TESTS = contrib/hdtbl/examples/test-hdtbl.sh
TESTS += $(hdtbl_TESTS)
contrib/hdtbl/examples/test-hdtbl.sh: \
@@ -107,7 +102,6 @@ contrib/hdtbl/examples/test-hdtbl.sh: \
$(top_srcdir)/$(hdtbl_test_template) > $@ \
&& chmod +x $@
MOSTLYCLEANFILES += $(hdtbl_TESTS)
-endif
# Rule to generate ps and roff files
SUFFIXES += .roff .in .ps
diff --git a/contrib/mom/ChangeLog b/contrib/mom/ChangeLog
index f50b60f4f..3750bf758 100644
--- a/contrib/mom/ChangeLog
+++ b/contrib/mom/ChangeLog
@@ -1,3 +1,12 @@
+2022-04-12 Ingo Schwarze <schwarze@openbsd.org>
+
+ Delete the harmful, ill-designed, buggy, and essentially
+ unmaintained and untested --with-doc option of the configure
+ script. See the NEWS file for more details on the rationale.
+
+ * mom.am: Delete one INSTALL_SHIPPED_HTML and one BUILD_EXAMPLES
+ conditional and use BUILD_PDFDOC instead of BUILD_PDFEXAMPLES.
+
2021-03-29 G. Branden Robinson <g.branden.robinson@gmail.com>
* mom.am: Eliminate `MOM_TFLAG` and `MOM_PFLAG` Make macros;
diff --git a/contrib/mom/mom.am b/contrib/mom/mom.am
index d566c1ce2..0689df8ca 100644
--- a/contrib/mom/mom.am
+++ b/contrib/mom/mom.am
@@ -38,7 +38,6 @@ momtmacdir = $(tmacdir)
dist_momtmac_DATA = $(MOMNORMALFILES)
# Files installed in htmldocdir/mom
-if INSTALL_SHIPPED_HTML
MOMHTMLDOCFILES=\
contrib/mom/momdoc/stylesheet.css \
contrib/mom/momdoc/appendices.html \
@@ -65,7 +64,6 @@ MOMHTMLDOCFILES=\
contrib/mom/momdoc/version-2.html
momhtmldir = $(htmldocdir)/mom
momhtml_DATA = $(MOMHTMLDOCFILES)
-endif
# Files installed in $(examplesdir)/mom. MOMEXAMPLEFILES are located
# in the source tree, while MOMPROCESSEDEXAMPLEFILES are generated in
@@ -86,14 +84,10 @@ MOMEXAMPLEFILES=\
contrib/mom/examples/slide-demo.mom \
contrib/mom/examples/copyright-default.mom \
contrib/mom/examples/copyright-chapter.mom
-if BUILD_EXAMPLES
momexampledir = $(exampledir)/mom
dist_momexample_DATA = $(MOMEXAMPLEFILES)
-else
-EXTRA_DIST += $(MOMEXAMPLEFILES)
-endif
-if BUILD_PDFEXAMPLES
+if BUILD_PDFDOC
MOMPROCESSEDEXAMPLEFILES = \
contrib/mom/examples/letter.pdf \
contrib/mom/examples/mom-pdf.pdf \
@@ -159,7 +153,7 @@ penguin.pdf:
install-data-hook: install_mom
install_mom:
-if BUILD_PDFEXAMPLES
+if BUILD_PDFDOC
for f in $(PDFDOCFILE); do \
$(RM) $(DESTDIR)$(pdfdocdir)/$$f; \
ln -s $(exampledir)/mom/$$f $(DESTDIR)$(pdfdocdir)/$$f; \