diff options
-rw-r--r-- | Build/source/texk/dvipdfm-x/ChangeLog | 7 | ||||
-rw-r--r-- | Build/source/texk/dvipdfm-x/Makefile.am | 13 | ||||
-rw-r--r-- | Build/source/texk/dvipdfm-x/Makefile.in | 16 | ||||
-rw-r--r-- | Build/source/texk/dvipdfm-x/man/dvipdfmx.1 (renamed from Build/source/texk/dvipdfm-x/man/dvipdfm.1) | 0 |
4 files changed, 23 insertions, 13 deletions
diff --git a/Build/source/texk/dvipdfm-x/ChangeLog b/Build/source/texk/dvipdfm-x/ChangeLog index 106615b4420..a7347e805f5 100644 --- a/Build/source/texk/dvipdfm-x/ChangeLog +++ b/Build/source/texk/dvipdfm-x/ChangeLog @@ -1,3 +1,10 @@ +2014-04-24 Karl Berry <karl@tug.org> + + * man/dvipdfm.1, + * Makefile.am (dist_man1_MANS): rename man page to dvipdfmx.1. + (man1_links): make a dvipdfm.1 link. + [XDVIPDFMX]: make an xdvipdfmx.1 link. + 2014-04-17 Karl Berry <karl@tug.org> * dvipdfmx.c (show_usage): default map in practice is pdftex.map. diff --git a/Build/source/texk/dvipdfm-x/Makefile.am b/Build/source/texk/dvipdfm-x/Makefile.am index d33e8291ee1..beb6ffb70c7 100644 --- a/Build/source/texk/dvipdfm-x/Makefile.am +++ b/Build/source/texk/dvipdfm-x/Makefile.am @@ -202,16 +202,21 @@ nodist_call_dvipdfmx_SOURCES = callexe.c include $(top_srcdir)/../../am/bin_links.am ## Manpages -## -# Note: dvipdft.1 used here needs to be updated -# and dvipdfm.1 be replaced by dvipdfmx.1 with a link to dvipdfm.1 man1_links = if DVIPDFMX -dist_man1_MANS = man/dvipdfm.1 man/dvipdft.1 man/extractbb.1 +dist_man1_MANS = man/dvipdfmx.1 man/dvipdft.1 man/extractbb.1 man1_links += extractbb:ebb +man1_links += dvipdfmx:dvipdfm endif DVIPDFMX +## doesn't seem worth worrying about the broken man page link +## if only xdvipdfmx is being built. not like there is x*x-specific +## documentation anywhere anyway. +if XDVIPDFMX +man1_links += dvipdfmx:xdvipdfmx +endif XDVIPDFMX + include $(top_srcdir)/../../am/man1_links.am ## Data diff --git a/Build/source/texk/dvipdfm-x/Makefile.in b/Build/source/texk/dvipdfm-x/Makefile.in index 648e5fc6cdd..9a70d82dffb 100644 --- a/Build/source/texk/dvipdfm-x/Makefile.in +++ b/Build/source/texk/dvipdfm-x/Makefile.in @@ -111,9 +111,10 @@ DIST_COMMON = $(top_srcdir)/../../am/bin_links.am \ $(top_srcdir)/../../build-aux/install-sh \ $(top_srcdir)/../../build-aux/ltmain.sh \ $(top_srcdir)/../../build-aux/missing -@DVIPDFMX_TRUE@am__append_4 = extractbb:ebb -@DVIPDFMX_TRUE@am__append_5 = $(dvipdfmx_tests) -@XDVIPDFMX_TRUE@am__append_6 = $(xdvipdfmx_tests) +@DVIPDFMX_TRUE@am__append_4 = extractbb:ebb dvipdfmx:dvipdfm +@XDVIPDFMX_TRUE@am__append_5 = dvipdfmx:xdvipdfmx +@DVIPDFMX_TRUE@am__append_6 = $(dvipdfmx_tests) +@XDVIPDFMX_TRUE@am__append_7 = $(xdvipdfmx_tests) subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \ @@ -797,11 +798,8 @@ xdvipdfmx_LDADD = $(FREETYPE2_LIBS) $(dvipdfmx_LDADD) bin_links = $(am__append_3) call_dvipdfmx_CPPFLAGS = -DEXEPROG=\"dvipdfmx.exe\" nodist_call_dvipdfmx_SOURCES = callexe.c - -# Note: dvipdft.1 used here needs to be updated -# and dvipdfm.1 be replaced by dvipdfmx.1 with a link to dvipdfm.1 -man1_links = $(am__append_4) -@DVIPDFMX_TRUE@dist_man1_MANS = man/dvipdfm.1 man/dvipdft.1 man/extractbb.1 +man1_links = $(am__append_4) $(am__append_5) +@DVIPDFMX_TRUE@dist_man1_MANS = man/dvipdfmx.1 man/dvipdft.1 man/extractbb.1 configdatadir = $(datarootdir)/texmf-dist/dvipdfmx dist_configdata_DATA = data/dvipdfmx.cfg glyphlistdatadir = $(datarootdir)/texmf-dist/fonts/map/glyphlist @@ -812,7 +810,7 @@ cmapdatadir = $(datarootdir)/texmf-dist/fonts/cmap/dvipdfmx dist_cmapdata_DATA = data/EUC-UCS2 DISTCLEANFILES = config.force img*.* pic*.* image*.pdf annot*.pdf \ bookm*.pdf paper*.pdf resrc*.pdf -TESTS = $(am__append_5) $(am__append_6) +TESTS = $(am__append_6) $(am__append_7) dvipdfmx_tests = dvipdfmx.test dvipdfm-ann.test dvipdfm-bb.test \ dvipdfm-bkm.test dvipdfm-psz.test dvipdfm-res.test xdvipdfmx_tests = xdvipdfmx.test xdvipdfm-ann.test xdvipdfm-bb.test \ diff --git a/Build/source/texk/dvipdfm-x/man/dvipdfm.1 b/Build/source/texk/dvipdfm-x/man/dvipdfmx.1 index 2aed4995d54..2aed4995d54 100644 --- a/Build/source/texk/dvipdfm-x/man/dvipdfm.1 +++ b/Build/source/texk/dvipdfm-x/man/dvipdfmx.1 |