From f439140058968120a5b503357a62b8e3b495c6d5 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 30 Jan 2020 19:18:37 +0000 Subject: install dvips-all.enc to texmf-dist/fonts/enc/dvips/base/ git-svn-id: svn://tug.org/texlive/trunk@53601 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/dvipsk/ChangeLog | 5 +++ Build/source/texk/dvipsk/Makefile.am | 4 ++- Build/source/texk/dvipsk/Makefile.in | 65 ++++++++++++++++++++++++----------- Build/source/texk/dvipsk/configure | 7 ++++ Build/source/texk/dvipsk/configure.ac | 10 ++++-- 5 files changed, 67 insertions(+), 24 deletions(-) (limited to 'Build/source') diff --git a/Build/source/texk/dvipsk/ChangeLog b/Build/source/texk/dvipsk/ChangeLog index 887c3ce8f01..c032c1ef3d1 100644 --- a/Build/source/texk/dvipsk/ChangeLog +++ b/Build/source/texk/dvipsk/ChangeLog @@ -1,3 +1,8 @@ +2020-01-30 Karl Berry + + * Makefile.am (enc_DATA): new variable, for new file dvips-all.enc. + * configure.ac (encdir): define it. + 2020-01-30 Akira Kakuto * bitmapenc.c: use strchr() instead of index(), because index() diff --git a/Build/source/texk/dvipsk/Makefile.am b/Build/source/texk/dvipsk/Makefile.am index 6048429fb30..c6ee55ed8e2 100644 --- a/Build/source/texk/dvipsk/Makefile.am +++ b/Build/source/texk/dvipsk/Makefile.am @@ -1,7 +1,7 @@ ## $Id$ ## Makefile.am for the TeX Live subdirectory texk/dvipsk/ ## -## Copyright 2017-2019 Karl Berry +## Copyright 2017-2020 Karl Berry ## Copyright 2009-2015 Peter Breitenlohner ## You may freely use, modify and/or distribute this file. ## @@ -72,6 +72,8 @@ dvips_TEXINFOS = contrib/config.proto dvips.help DISTCLEANFILES = $(DVIS) $(PSS) +enc_DATA = dvips-all.enc + prolog_DATA = $(prologues) dist_prologues = \ diff --git a/Build/source/texk/dvipsk/Makefile.in b/Build/source/texk/dvipsk/Makefile.in index 49fd14400b7..7c43a4d944f 100644 --- a/Build/source/texk/dvipsk/Makefile.in +++ b/Build/source/texk/dvipsk/Makefile.in @@ -112,7 +112,8 @@ CONFIG_HEADER = c-auto.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(infodir)" \ - "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(prologdir)" + "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(encdir)" \ + "$(DESTDIR)$(prologdir)" PROGRAMS = $(bin_PROGRAMS) am_afm2tfm_OBJECTS = afm2tfm.$(OBJEXT) afm2tfm_OBJECTS = $(am_afm2tfm_OBJECTS) @@ -274,7 +275,7 @@ am__uninstall_files_from_dir = { \ man1dir = $(mandir)/man1 NROFF = nroff MANS = $(dist_man1_MANS) -DATA = $(prolog_DATA) +DATA = $(enc_DATA) $(prolog_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive am__recursive_targets = \ @@ -634,6 +635,7 @@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ dvidir = @dvidir@ +encdir = @encdir@ exec_prefix = @exec_prefix@ host = @host@ host_alias = @host_alias@ @@ -718,6 +720,7 @@ DISTCLEANFILES = $(DVIS) $(PSS) afmtest.tfm beginfontk1.ps \ eepic-nan.ps pfbincl.ps *badnews* same-name.out dvipstst.ps \ missfont.log mtest.ps overflow-color-push.ps \ overflow-epsfile.ps overflow-psbox.ps +enc_DATA = dvips-all.enc prolog_DATA = $(prologues) dist_prologues = \ color.lpro \ @@ -1143,6 +1146,27 @@ uninstall-man1: } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir) +install-encDATA: $(enc_DATA) + @$(NORMAL_INSTALL) + @list='$(enc_DATA)'; test -n "$(encdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(encdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(encdir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(encdir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(encdir)" || exit $$?; \ + done + +uninstall-encDATA: + @$(NORMAL_UNINSTALL) + @list='$(enc_DATA)'; test -n "$(encdir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(encdir)'; $(am__uninstall_files_from_dir) install-prologDATA: $(prolog_DATA) @$(NORMAL_INSTALL) @list='$(prolog_DATA)'; test -n "$(prologdir)" || list=; \ @@ -1641,7 +1665,7 @@ check: check-recursive all-am: Makefile $(INFO_DEPS) $(PROGRAMS) $(MANS) $(DATA) c-auto.h installdirs: installdirs-recursive installdirs-am: - for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(infodir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(prologdir)"; do \ + for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(infodir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(encdir)" "$(DESTDIR)$(prologdir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-recursive @@ -1735,7 +1759,8 @@ info: info-recursive info-am: $(INFO_DEPS) -install-data-am: install-info-am install-man install-prologDATA +install-data-am: install-encDATA install-info-am install-man \ + install-prologDATA install-dvi: install-dvi-recursive @@ -1907,9 +1932,9 @@ ps: ps-recursive ps-am: $(PSS) -uninstall-am: uninstall-binPROGRAMS uninstall-dvi-am uninstall-html-am \ - uninstall-info-am uninstall-man uninstall-pdf-am \ - uninstall-prologDATA uninstall-ps-am +uninstall-am: uninstall-binPROGRAMS uninstall-dvi-am uninstall-encDATA \ + uninstall-html-am uninstall-info-am uninstall-man \ + uninstall-pdf-am uninstall-prologDATA uninstall-ps-am uninstall-man: uninstall-man1 @@ -1925,19 +1950,19 @@ uninstall-man: uninstall-man1 distclean-libtool distclean-tags distcleancheck distdir \ distuninstallcheck dvi dvi-am html html-am info info-am \ install install-am install-binPROGRAMS install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-man1 install-pdf \ - install-pdf-am install-prologDATA install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - installdirs-am maintainer-clean maintainer-clean-aminfo \ - maintainer-clean-generic mostlyclean mostlyclean-aminfo \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am recheck tags tags-am uninstall \ - uninstall-am uninstall-binPROGRAMS uninstall-dvi-am \ - uninstall-html-am uninstall-info-am uninstall-man \ - uninstall-man1 uninstall-pdf-am uninstall-prologDATA \ - uninstall-ps-am + install-data-am install-dvi install-dvi-am install-encDATA \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-man1 \ + install-pdf install-pdf-am install-prologDATA install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs installdirs-am maintainer-clean \ + maintainer-clean-aminfo maintainer-clean-generic mostlyclean \ + mostlyclean-aminfo mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am recheck tags tags-am \ + uninstall uninstall-am uninstall-binPROGRAMS uninstall-dvi-am \ + uninstall-encDATA uninstall-html-am uninstall-info-am \ + uninstall-man uninstall-man1 uninstall-pdf-am \ + uninstall-prologDATA uninstall-ps-am .PRECIOUS: Makefile diff --git a/Build/source/texk/dvipsk/configure b/Build/source/texk/dvipsk/configure index d2e9b8479ea..f145971b236 100755 --- a/Build/source/texk/dvipsk/configure +++ b/Build/source/texk/dvipsk/configure @@ -638,6 +638,7 @@ am__EXEEXT_TRUE LTLIBOBJS LIBOBJS subdirs +encdir KPATHSEA_RULE KPATHSEA_DEPEND KPATHSEA_LIBS @@ -2739,6 +2740,7 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. +# Common code for all programs using libkpathsea. am__api_version='1.16' # Find a good install program. We prefer a C program (faster), @@ -15210,9 +15212,14 @@ if test "x$kpse_cv_kpse_debug" != xyes; then : fi +# For dvips-all.enc. +encdir='${datarootdir}/texmf-dist/fonts/enc/dvips/base' + + ac_config_files="$ac_config_files Makefile" +# The subdirectory squeeze must be configured for the build system. subdirs="$subdirs squeeze" diff --git a/Build/source/texk/dvipsk/configure.ac b/Build/source/texk/dvipsk/configure.ac index 93b5e5b66de..8e6546d789c 100644 --- a/Build/source/texk/dvipsk/configure.ac +++ b/Build/source/texk/dvipsk/configure.ac @@ -1,4 +1,4 @@ -# $Id$ +dnl $Id$ dnl Process this file with autoconf to produce a configure script. dnl dnl Copyright 2016-2020 Karl Berry @@ -14,7 +14,7 @@ AC_CONFIG_SRCDIR([dvips.c]) AC_CONFIG_AUX_DIR([../../build-aux]) AC_CONFIG_MACRO_DIR([../../m4]) -dnl Common code for all programs using libkpathsea. +# Common code for all programs using libkpathsea. KPSE_COMMON([dvipsk]) KPSE_CANONICAL_HOST @@ -26,9 +26,13 @@ AC_SEARCH_LIBS([pow], [m]) KPSE_KPATHSEA_FLAGS +# For dvips-all.enc. +encdir='${datarootdir}/texmf-dist/fonts/enc/dvips/base' +AC_SUBST([encdir]) + AC_CONFIG_FILES([Makefile]) -dnl The subdirectory squeeze must be configured for the build system. +# The subdirectory squeeze must be configured for the build system. KPSE_NATIVE_SUBDIRS([squeeze]) AC_OUTPUT -- cgit v1.2.3