From c5dd4916343ca403a95bb078158d714909a5bcb8 Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Fri, 3 Jun 2011 08:04:29 +0000 Subject: revert r22717 (compare r22733) git-svn-id: svn://tug.org/texlive/trunk@22754 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/dvipdfmx/ChangeLog | 5 +++ Build/source/texk/dvipdfmx/Makefile.am | 8 ++--- Build/source/texk/dvipdfmx/Makefile.in | 56 +++++++++++++++++++++++++--------- 3 files changed, 50 insertions(+), 19 deletions(-) (limited to 'Build') diff --git a/Build/source/texk/dvipdfmx/ChangeLog b/Build/source/texk/dvipdfmx/ChangeLog index dc81dd2e86c..1ed18d83fc0 100644 --- a/Build/source/texk/dvipdfmx/ChangeLog +++ b/Build/source/texk/dvipdfmx/ChangeLog @@ -1,3 +1,8 @@ +2011-06-03 Peter Breitenlohner + + * Makefile.am (mapdata*): Do install the map file, still needed + in pTeX. + 2011-06-01 Peter Breitenlohner * Makefile.am (mapdata*): Don't install the map file. diff --git a/Build/source/texk/dvipdfmx/Makefile.am b/Build/source/texk/dvipdfmx/Makefile.am index 90e728a7d71..613b4f20549 100644 --- a/Build/source/texk/dvipdfmx/Makefile.am +++ b/Build/source/texk/dvipdfmx/Makefile.am @@ -219,11 +219,9 @@ glyphlistdata_DATA = \ $(DVIPDFMX_TREE)/data/glyphlist.txt \ $(DVIPDFMX_TREE)/data/pdfglyphlist.txt -## Don't install the map file -## -##mapdatadir = ${prefix}/texmf/fonts/map/dvipdfmx -##mapdata_DATA = \ -## $(DVIPDFMX_TREE)/data/cid-x.map +mapdatadir = ${prefix}/texmf/fonts/map/dvipdfmx +mapdata_DATA = \ + $(DVIPDFMX_TREE)/data/cid-x.map cmapdatadir = ${prefix}/texmf/fonts/cmap/dvipdfmx cmapdata_DATA = \ diff --git a/Build/source/texk/dvipdfmx/Makefile.in b/Build/source/texk/dvipdfmx/Makefile.in index d6d8d86ac98..30ba81bad8d 100644 --- a/Build/source/texk/dvipdfmx/Makefile.in +++ b/Build/source/texk/dvipdfmx/Makefile.in @@ -77,7 +77,8 @@ CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" \ "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(cmapdatadir)" \ - "$(DESTDIR)$(configdatadir)" "$(DESTDIR)$(glyphlistdatadir)" + "$(DESTDIR)$(configdatadir)" "$(DESTDIR)$(glyphlistdatadir)" \ + "$(DESTDIR)$(mapdatadir)" PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) am_call_dvipdfmx_OBJECTS = call_dvipdfmx-callexe.$(OBJEXT) call_dvipdfmx_OBJECTS = $(am_call_dvipdfmx_OBJECTS) @@ -160,7 +161,8 @@ DIST_SOURCES = $(call_dvipdfmx_SOURCES) $(dvipdfmx_SOURCES) man1dir = $(mandir)/man1 NROFF = nroff MANS = $(dist_man1_MANS) $(man1_MANS) -DATA = $(cmapdata_DATA) $(configdata_DATA) $(glyphlistdata_DATA) +DATA = $(cmapdata_DATA) $(configdata_DATA) $(glyphlistdata_DATA) \ + $(mapdata_DATA) ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -474,6 +476,10 @@ glyphlistdata_DATA = \ $(DVIPDFMX_TREE)/data/glyphlist.txt \ $(DVIPDFMX_TREE)/data/pdfglyphlist.txt +mapdatadir = ${prefix}/texmf/fonts/map/dvipdfmx +mapdata_DATA = \ + $(DVIPDFMX_TREE)/data/cid-x.map + cmapdatadir = ${prefix}/texmf/fonts/cmap/dvipdfmx cmapdata_DATA = \ $(DVIPDFMX_TREE)/data/EUC-UCS2 @@ -1819,6 +1825,26 @@ uninstall-glyphlistdataDATA: test -n "$$files" || exit 0; \ echo " ( cd '$(DESTDIR)$(glyphlistdatadir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(glyphlistdatadir)" && rm -f $$files +install-mapdataDATA: $(mapdata_DATA) + @$(NORMAL_INSTALL) + test -z "$(mapdatadir)" || $(MKDIR_P) "$(DESTDIR)$(mapdatadir)" + @list='$(mapdata_DATA)'; test -n "$(mapdatadir)" || list=; \ + 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)$(mapdatadir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(mapdatadir)" || exit $$?; \ + done + +uninstall-mapdataDATA: + @$(NORMAL_UNINSTALL) + @list='$(mapdata_DATA)'; test -n "$(mapdatadir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(mapdatadir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(mapdatadir)" && rm -f $$files ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -2039,7 +2065,7 @@ check-am: all-am check: check-am all-am: Makefile $(PROGRAMS) $(SCRIPTS) $(MANS) $(DATA) config.h installdirs: - for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(cmapdatadir)" "$(DESTDIR)$(configdatadir)" "$(DESTDIR)$(glyphlistdatadir)"; do \ + for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(cmapdatadir)" "$(DESTDIR)$(configdatadir)" "$(DESTDIR)$(glyphlistdatadir)" "$(DESTDIR)$(mapdatadir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -2093,7 +2119,7 @@ info: info-am info-am: install-data-am: install-cmapdataDATA install-configdataDATA \ - install-glyphlistdataDATA install-man + install-glyphlistdataDATA install-man install-mapdataDATA @$(NORMAL_INSTALL) $(MAKE) $(AM_MAKEFLAGS) install-data-hook install-dvi: install-dvi-am @@ -2145,7 +2171,8 @@ ps-am: uninstall-am: uninstall-binPROGRAMS uninstall-cmapdataDATA \ uninstall-configdataDATA uninstall-dist_binSCRIPTS \ - uninstall-glyphlistdataDATA uninstall-man + uninstall-glyphlistdataDATA uninstall-man \ + uninstall-mapdataDATA @$(NORMAL_INSTALL) $(MAKE) $(AM_MAKEFLAGS) uninstall-hook uninstall-man: uninstall-man1 @@ -2166,15 +2193,16 @@ uninstall-man: uninstall-man1 install-dvi install-dvi-am install-exec install-exec-am \ install-exec-hook install-glyphlistdataDATA install-html \ install-html-am install-info install-info-am install-man \ - install-man1 install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ - uninstall-am uninstall-binPROGRAMS uninstall-cmapdataDATA \ - uninstall-configdataDATA uninstall-dist_binSCRIPTS \ - uninstall-glyphlistdataDATA uninstall-hook uninstall-man \ - uninstall-man1 + install-man1 install-mapdataDATA install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags uninstall uninstall-am uninstall-binPROGRAMS \ + uninstall-cmapdataDATA uninstall-configdataDATA \ + uninstall-dist_binSCRIPTS uninstall-glyphlistdataDATA \ + uninstall-hook uninstall-man uninstall-man1 \ + uninstall-mapdataDATA # in case of an SVN repository -- cgit v1.2.3