summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2011-06-01 06:35:42 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2011-06-01 06:35:42 +0000
commit3cf3c93ef1737d6e637b9a8ec23089c587574096 (patch)
tree73b5f4f25dd33a729993b11e287099751951f0ea
parentd89ba7f7c858e5b09cb6c600e50f59c9b198bbc3 (diff)
rm dvipdfmx map file, no longer used (compare r22706)
git-svn-id: svn://tug.org/texlive/trunk@22717 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/texk/dvipdfmx/ChangeLog4
-rw-r--r--Build/source/texk/dvipdfmx/Makefile.am8
-rw-r--r--Build/source/texk/dvipdfmx/Makefile.in56
3 files changed, 23 insertions, 45 deletions
diff --git a/Build/source/texk/dvipdfmx/ChangeLog b/Build/source/texk/dvipdfmx/ChangeLog
index 35a8cd24487..dc81dd2e86c 100644
--- a/Build/source/texk/dvipdfmx/ChangeLog
+++ b/Build/source/texk/dvipdfmx/ChangeLog
@@ -1,3 +1,7 @@
+2011-06-01 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am (mapdata*): Don't install the map file.
+
2011-05-30 Peter Breitenlohner <peb@mppmu.mpg.de>
* doc/Makefile.am: Use ../am/bin_links.am for $(bindir) links.
diff --git a/Build/source/texk/dvipdfmx/Makefile.am b/Build/source/texk/dvipdfmx/Makefile.am
index 613b4f20549..90e728a7d71 100644
--- a/Build/source/texk/dvipdfmx/Makefile.am
+++ b/Build/source/texk/dvipdfmx/Makefile.am
@@ -219,9 +219,11 @@ 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
+## Don't install the map file
+##
+##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 30ba81bad8d..d6d8d86ac98 100644
--- a/Build/source/texk/dvipdfmx/Makefile.in
+++ b/Build/source/texk/dvipdfmx/Makefile.in
@@ -77,8 +77,7 @@ CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" \
"$(DESTDIR)$(man1dir)" "$(DESTDIR)$(cmapdatadir)" \
- "$(DESTDIR)$(configdatadir)" "$(DESTDIR)$(glyphlistdatadir)" \
- "$(DESTDIR)$(mapdatadir)"
+ "$(DESTDIR)$(configdatadir)" "$(DESTDIR)$(glyphlistdatadir)"
PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
am_call_dvipdfmx_OBJECTS = call_dvipdfmx-callexe.$(OBJEXT)
call_dvipdfmx_OBJECTS = $(am_call_dvipdfmx_OBJECTS)
@@ -161,8 +160,7 @@ 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) \
- $(mapdata_DATA)
+DATA = $(cmapdata_DATA) $(configdata_DATA) $(glyphlistdata_DATA)
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -476,10 +474,6 @@ 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
@@ -1825,26 +1819,6 @@ 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)'; \
@@ -2065,7 +2039,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)" "$(DESTDIR)$(mapdatadir)"; do \
+ for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(cmapdatadir)" "$(DESTDIR)$(configdatadir)" "$(DESTDIR)$(glyphlistdatadir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-am
@@ -2119,7 +2093,7 @@ info: info-am
info-am:
install-data-am: install-cmapdataDATA install-configdataDATA \
- install-glyphlistdataDATA install-man install-mapdataDATA
+ install-glyphlistdataDATA install-man
@$(NORMAL_INSTALL)
$(MAKE) $(AM_MAKEFLAGS) install-data-hook
install-dvi: install-dvi-am
@@ -2171,8 +2145,7 @@ ps-am:
uninstall-am: uninstall-binPROGRAMS uninstall-cmapdataDATA \
uninstall-configdataDATA uninstall-dist_binSCRIPTS \
- uninstall-glyphlistdataDATA uninstall-man \
- uninstall-mapdataDATA
+ uninstall-glyphlistdataDATA uninstall-man
@$(NORMAL_INSTALL)
$(MAKE) $(AM_MAKEFLAGS) uninstall-hook
uninstall-man: uninstall-man1
@@ -2193,16 +2166,15 @@ 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-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
+ 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
# in case of an SVN repository