summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2022-02-26 17:51:21 +0000
committerKarl Berry <karl@freefriends.org>2022-02-26 17:51:21 +0000
commit312b400275fcb3524f3188d52f48aae532215799 (patch)
treea6ae75bd8a9b16a0f9a95272dc769b88d8000b6f /Build
parentfb35a3c228c13fde3608b597bab2783151226099 (diff)
2022 pretest start
git-svn-id: svn://tug.org/texlive/trunk@62186 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r--Build/source/texk/web2c/Makefile.in15
-rw-r--r--Build/source/texk/web2c/hitexdir/ChangeLog10
-rw-r--r--Build/source/texk/web2c/hitexdir/am/hitex.am7
-rw-r--r--Build/source/texk/web2c/man/ChangeLog4
-rw-r--r--Build/source/texk/web2c/man/Makefile.am3
-rw-r--r--Build/source/texk/web2c/man/Makefile.in3
6 files changed, 34 insertions, 8 deletions
diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in
index 98eb015e3b6..bc1ce361562 100644
--- a/Build/source/texk/web2c/Makefile.in
+++ b/Build/source/texk/web2c/Makefile.in
@@ -2620,7 +2620,7 @@ am__can_run_installinfo = \
man1dir = $(mandir)/man1
man5dir = $(mandir)/man5
NROFF = nroff
-MANS = $(dist_man_MANS) $(nodist_man_MANS)
+MANS = $(dist_man_MANS) $(man1_MANS) $(nodist_man_MANS)
DATA = $(pkgconfig_DATA)
am__syncinclude_HEADERS_DIST = synctexdir/synctex_parser.h \
synctexdir/synctex_version.h synctexdir/synctex_parser_utils.h
@@ -4643,6 +4643,11 @@ euptex_ch_srcs = \
# e-upTeX Tests
#
euptex_tests = euptexdir/euptriptest.test euptexdir/pdfprimitive.test euptexdir/eupver.test
+
+# At the moment, these are the only man pages handled in the
+# conglomerated web2c/Makefile[.am]. (All the others are in man/.)
+# If that changes, have to set at top level and use +=.
+@HITEX_TRUE@man1_MANS = hitexdir/hishrink.man hitexdir/histretch.man hitexdir/hitex.man
hitex_CPPFLAGS = $(AM_CPPFLAGS) $(ZLIB_INCLUDES) -I$(srcdir)/libmd5 \
-DINIT -DSTAT -DDEBUG
hitex_LDADD = $(KPATHSEA_LIBS) $(ZLIB_LIBS) libmd5.a libmd5.a
@@ -19194,9 +19199,9 @@ clean-libtool:
distclean-libtool:
-rm -f libtool config.lt
-install-man1: $(dist_man_MANS) $(nodist_man_MANS)
+install-man1: $(dist_man_MANS) $(man1_MANS) $(nodist_man_MANS)
@$(NORMAL_INSTALL)
- @list1=''; \
+ @list1='$(man1_MANS)'; \
list2='$(dist_man_MANS) $(nodist_man_MANS)'; \
test -n "$(man1dir)" \
&& test -n "`echo $$list1$$list2`" \
@@ -19230,7 +19235,7 @@ install-man1: $(dist_man_MANS) $(nodist_man_MANS)
uninstall-man1:
@$(NORMAL_UNINSTALL)
- @list=''; test -n "$(man1dir)" || exit 0; \
+ @list='$(man1_MANS)'; test -n "$(man1dir)" || exit 0; \
files=`{ for i in $$list; do echo "$$i"; done; \
l2='$(dist_man_MANS) $(nodist_man_MANS)'; for i in $$l2; do echo "$$i"; done | \
sed -n '/\.1[a-z]*$$/p'; \
@@ -22412,7 +22417,7 @@ euptrip-clean:
# (end of euptex.am)
# convenience target to build all the programs here.
-hiall: hitex hishrink histretch
+@HITEX_TRUE@hiall: hitex hishrink histretch
$(hiformat_c_h_l_y): hiformat-tangle
diff --git a/Build/source/texk/web2c/hitexdir/ChangeLog b/Build/source/texk/web2c/hitexdir/ChangeLog
index 2b359ac17b7..50772884cce 100644
--- a/Build/source/texk/web2c/hitexdir/ChangeLog
+++ b/Build/source/texk/web2c/hitexdir/ChangeLog
@@ -1,3 +1,13 @@
+2022-02-26 Karl Berry <karl@tug.org>
+
+ * am/hitex.am (man1_MANS): install hi*.man directly from here,
+ not using the man/ subdir as for all others.
+
+2022-02-24 Karl Berry <karl@tug.org>
+
+ * hiformat.w (DESCRIPTION) x2: consistent quoting.
+ (explain usage): newline before options list.
+
2022-01-10 Karl Berry <karl@freefriends.org>
* am/hitex.am: do not silence tangle-sh.
diff --git a/Build/source/texk/web2c/hitexdir/am/hitex.am b/Build/source/texk/web2c/hitexdir/am/hitex.am
index 1f19c0d305f..2032a317960 100644
--- a/Build/source/texk/web2c/hitexdir/am/hitex.am
+++ b/Build/source/texk/web2c/hitexdir/am/hitex.am
@@ -7,11 +7,16 @@
if HITEX
bin_PROGRAMS += hitex hishrink histretch
noinst_PROGRAMS += himktables
-endif HITEX
# convenience target to build all the programs here.
hiall: hitex hishrink histretch
+# At the moment, these are the only man pages handled in the
+# conglomerated web2c/Makefile[.am]. (All the others are in man/.)
+# If that changes, have to set at top level and use +=.
+man1_MANS = hitexdir/hishrink.man hitexdir/histretch.man hitexdir/hitex.man
+endif HITEX
+
## Debugging for the parser as usual.
## Except we eschew all lex/yacc steps in the Makefile here; see below.
## AM_YFLAGS = -d -v -Wno-yacc
diff --git a/Build/source/texk/web2c/man/ChangeLog b/Build/source/texk/web2c/man/ChangeLog
index 0d6f4b8d165..708354705c1 100644
--- a/Build/source/texk/web2c/man/ChangeLog
+++ b/Build/source/texk/web2c/man/ChangeLog
@@ -1,3 +1,7 @@
+2022-02-26 Karl Berry <karl@tug.org>
+
+ * Makefile.am (web_man_sources): add twill.man.
+
2022-02-02 Andreas Scherer <https://ascherer.github.io>
* ctwill.man: CWEB 4.7 release.
diff --git a/Build/source/texk/web2c/man/Makefile.am b/Build/source/texk/web2c/man/Makefile.am
index 4c51c664487..4af456725c0 100644
--- a/Build/source/texk/web2c/man/Makefile.am
+++ b/Build/source/texk/web2c/man/Makefile.am
@@ -19,7 +19,8 @@ endif WEB
EXTRA_DIST += $(web_man_sources)
web_man_sources = bibtex.man dvicopy.man dvitomp.man dvitype.man gftodvi.man \
gftopk.man gftype.man mft.man patgen.man pktogf.man pktype.man \
- pltotf.man pooltype.man tftopl.man vftovp.man vptovf.man weave.man
+ pltotf.man pooltype.man tftopl.man twill.man \
+ vftovp.man vptovf.man weave.man
if TEX
man_sources += tex.man
diff --git a/Build/source/texk/web2c/man/Makefile.in b/Build/source/texk/web2c/man/Makefile.in
index 342f1b670a3..121896fd8dc 100644
--- a/Build/source/texk/web2c/man/Makefile.in
+++ b/Build/source/texk/web2c/man/Makefile.in
@@ -468,7 +468,8 @@ man1_links = cweb:ctangle cweb:cweave ctwill:ctwill-refsort \
latex-dev:uplatex-dev
web_man_sources = bibtex.man dvicopy.man dvitomp.man dvitype.man gftodvi.man \
gftopk.man gftype.man mft.man patgen.man pktogf.man pktype.man \
- pltotf.man pooltype.man tftopl.man vftovp.man vptovf.man weave.man
+ pltotf.man pooltype.man tftopl.man twill.man \
+ vftovp.man vptovf.man weave.man
pdftex_man_sources = pdftex.man pdftosrc.man ttf2afm.man
otangle_man_sources = ofm2opl.man opl2ofm.man ovf2ovp.man ovp2ovf.man