summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorJonathan Kew <jfkthame@googlemail.com>2006-12-21 13:46:15 +0000
committerJonathan Kew <jfkthame@googlemail.com>2006-12-21 13:46:15 +0000
commitd9a42820f293c9395679325d775a16c2ce7333d3 (patch)
tree3e6a8074f3c2769b774a64095cb5b8bfc26db959 /Build
parent9224ac02ef41b932a460edede965e4f3672f98de (diff)
skip data subdir in xdvipdfmx (duplicates data from dvipdfmx)
git-svn-id: svn://tug.org/texlive/trunk@2837 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r--Build/source/texk/xdvipdfmx/Makefile.am5
-rw-r--r--Build/source/texk/xdvipdfmx/Makefile.in6
-rw-r--r--Build/source/texk/xdvipdfmx/data/Makefile.am31
-rw-r--r--Build/source/texk/xdvipdfmx/data/Makefile.in74
4 files changed, 55 insertions, 61 deletions
diff --git a/Build/source/texk/xdvipdfmx/Makefile.am b/Build/source/texk/xdvipdfmx/Makefile.am
index 3da2d71a61f..b1348f9416a 100644
--- a/Build/source/texk/xdvipdfmx/Makefile.am
+++ b/Build/source/texk/xdvipdfmx/Makefile.am
@@ -1 +1,4 @@
-SUBDIRS = data src
+# SUBDIRS = data src
+
+# skip the data subdir; we rely on dvipdfmx to provide those files
+SUBDIRS = src
diff --git a/Build/source/texk/xdvipdfmx/Makefile.in b/Build/source/texk/xdvipdfmx/Makefile.in
index 106c12f2ef1..9b9a2f2a008 100644
--- a/Build/source/texk/xdvipdfmx/Makefile.in
+++ b/Build/source/texk/xdvipdfmx/Makefile.in
@@ -13,6 +13,8 @@
# PARTICULAR PURPOSE.
@SET_MAKE@
+
+# SUBDIRS = data src
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
@@ -168,7 +170,9 @@ sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
xdvipdfmx_LDFLAGS = @xdvipdfmx_LDFLAGS@
-SUBDIRS = data src
+
+# skip the data subdir; we rely on dvipdfmx to provide those files
+SUBDIRS = src
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive
diff --git a/Build/source/texk/xdvipdfmx/data/Makefile.am b/Build/source/texk/xdvipdfmx/data/Makefile.am
index 8e2485248b3..b210bfeee1b 100644
--- a/Build/source/texk/xdvipdfmx/data/Makefile.am
+++ b/Build/source/texk/xdvipdfmx/data/Makefile.am
@@ -1,25 +1,8 @@
pkgdatadir = $(datadir)/texmf/dvipdfm
-pkgdata_DATA = CMap config
-EXTRA_DIST = $(pkgdata_DATA)
-
-install-pkgdataDATA: $(pkgdata_DATA)
- @$(NORMAL_INSTALL)
- $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
- @list='$(pkgdata_DATA)'; for adir in $$list; do \
- $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/$$adir; \
- for p in $$adir/*; do \
- if test -f $(srcdir)/$$p; then \
- echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkgdatadir)/$$p"; \
- $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkgdatadir)/$$p; \
- else if test -f $$p; then \
- echo " $(INSTALL_DATA) $$p $(DESTDIR)$(pkgdatadir)/$$p"; \
- $(INSTALL_DATA) $$p $(DESTDIR)$(pkgdatadir)/$$p; \
- fi; fi; \
- done; \
- done
-
-uninstall-pkgdataDATA:
- @$(NORMAL_UNINSTALL)
- list='$(pkgdata_DATA)'; for p in $$list; do \
- rm -rf $(DESTDIR)$(pkgdatadir)/$$p; \
- done
+dist_pkgdata_DATA = \
+ $(srcdir)/CMap/EUC-UCS2 \
+ $(srcdir)/CMap/UniKSCms-UCS2-H \
+ $(srcdir)/CMap/UniKSCms-UCS2-V \
+ $(srcdir)/config/glyphlist.txt \
+ $(srcdir)/config/cid-x.map \
+ $(srcdir)/config/dvipdfmx.cfg
diff --git a/Build/source/texk/xdvipdfmx/data/Makefile.in b/Build/source/texk/xdvipdfmx/data/Makefile.in
index 4d3ee6be4b0..4150e988e40 100644
--- a/Build/source/texk/xdvipdfmx/data/Makefile.in
+++ b/Build/source/texk/xdvipdfmx/data/Makefile.in
@@ -34,7 +34,8 @@ NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
subdir = data
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(dist_pkgdata_DATA) $(srcdir)/Makefile.am \
+ $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
$(top_srcdir)/../../libs/libpng/withenable.ac \
@@ -58,8 +59,8 @@ am__vpath_adj = case $$p in \
esac;
am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
am__installdirs = "$(DESTDIR)$(pkgdatadir)"
-pkgdataDATA_INSTALL = $(INSTALL_DATA)
-DATA = $(pkgdata_DATA)
+dist_pkgdataDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(dist_pkgdata_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
pkgdatadir = $(datadir)/texmf/dvipdfm
ACLOCAL = @ACLOCAL@
@@ -153,8 +154,14 @@ sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
xdvipdfmx_LDFLAGS = @xdvipdfmx_LDFLAGS@
-pkgdata_DATA = CMap config
-EXTRA_DIST = $(pkgdata_DATA)
+dist_pkgdata_DATA = \
+ $(srcdir)/CMap/EUC-UCS2 \
+ $(srcdir)/CMap/UniKSCms-UCS2-H \
+ $(srcdir)/CMap/UniKSCms-UCS2-V \
+ $(srcdir)/config/glyphlist.txt \
+ $(srcdir)/config/cid-x.map \
+ $(srcdir)/config/dvipdfmx.cfg
+
all: all-am
.SUFFIXES:
@@ -188,6 +195,23 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
uninstall-info-am:
+install-dist_pkgdataDATA: $(dist_pkgdata_DATA)
+ @$(NORMAL_INSTALL)
+ test -z "$(pkgdatadir)" || $(mkdir_p) "$(DESTDIR)$(pkgdatadir)"
+ @list='$(dist_pkgdata_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+ echo " $(dist_pkgdataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgdatadir)/$$f'"; \
+ $(dist_pkgdataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgdatadir)/$$f"; \
+ done
+
+uninstall-dist_pkgdataDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(dist_pkgdata_DATA)'; for p in $$list; do \
+ f=$(am__strip_dir) \
+ echo " rm -f '$(DESTDIR)$(pkgdatadir)/$$f'"; \
+ rm -f "$(DESTDIR)$(pkgdatadir)/$$f"; \
+ done
tags: TAGS
TAGS:
@@ -196,6 +220,7 @@ CTAGS:
distdir: $(DISTFILES)
+ $(mkdir_p) $(distdir)/CMap $(distdir)/config
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
list='$(DISTFILES)'; for file in $$list; do \
@@ -271,7 +296,7 @@ info: info-am
info-am:
-install-data-am: install-pkgdataDATA
+install-data-am: install-dist_pkgdataDATA
install-exec-am:
@@ -297,39 +322,18 @@ ps: ps-am
ps-am:
-uninstall-am: uninstall-info-am uninstall-pkgdataDATA
+uninstall-am: uninstall-dist_pkgdataDATA uninstall-info-am
.PHONY: all all-am check check-am clean clean-generic distclean \
distclean-generic distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-exec \
- install-exec-am install-info install-info-am install-man \
- install-pkgdataDATA install-strip installcheck installcheck-am \
- installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
- uninstall-am uninstall-info-am uninstall-pkgdataDATA
+ install install-am install-data install-data-am \
+ install-dist_pkgdataDATA install-exec install-exec-am \
+ install-info install-info-am install-man install-strip \
+ installcheck installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+ pdf-am ps ps-am uninstall uninstall-am \
+ uninstall-dist_pkgdataDATA uninstall-info-am
-
-install-pkgdataDATA: $(pkgdata_DATA)
- @$(NORMAL_INSTALL)
- $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
- @list='$(pkgdata_DATA)'; for adir in $$list; do \
- $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/$$adir; \
- for p in $$adir/*; do \
- if test -f $(srcdir)/$$p; then \
- echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkgdatadir)/$$p"; \
- $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkgdatadir)/$$p; \
- else if test -f $$p; then \
- echo " $(INSTALL_DATA) $$p $(DESTDIR)$(pkgdatadir)/$$p"; \
- $(INSTALL_DATA) $$p $(DESTDIR)$(pkgdatadir)/$$p; \
- fi; fi; \
- done; \
- done
-
-uninstall-pkgdataDATA:
- @$(NORMAL_UNINSTALL)
- list='$(pkgdata_DATA)'; for p in $$list; do \
- rm -rf $(DESTDIR)$(pkgdatadir)/$$p; \
- done
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT: