summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Build/source/texk/dvipdfmx/dvipdfmx-20120420-PATCHES/patch-05-cid-x_map6
-rw-r--r--Build/source/texk/web2c/Makefile.in2
-rw-r--r--Build/source/texk/web2c/mplibdir/ChangeLog6
-rw-r--r--Build/source/texk/web2c/mplibdir/am/mplib.am4
4 files changed, 11 insertions, 7 deletions
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20120420-PATCHES/patch-05-cid-x_map b/Build/source/texk/dvipdfmx/dvipdfmx-20120420-PATCHES/patch-05-cid-x_map
index e58f0c0ab02..3d9dfb0223a 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20120420-PATCHES/patch-05-cid-x_map
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420-PATCHES/patch-05-cid-x_map
@@ -1,6 +1,6 @@
-diff -ur dvipdfmx-20120420/data/cid-x.map.orig dvipdfmx-20120420/data/cid-x.map
---- dvipdfmx-20120420/data/cid-x.map.orig 2012-05-21 10:21:39.127888382 +0900
-+++ dvipdfmx-20120420/data/cid-x.map 2012-05-21 10:21:54.255899122 +0900
+diff -ur dvipdfmx-20120420.orig/data/cid-x.map dvipdfmx-20120420/data/cid-x.map
+--- dvipdfmx-20120420.orig/data/cid-x.map 2008-04-21 02:43:12.000000000 +0200
++++ dvipdfmx-20120420/data/cid-x.map 2012-05-21 03:25:38.000000000 +0200
@@ -76,6 +76,9 @@
rmlv V Ryumin-Light
gbmv V GothicBBB-Medium
diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in
index 5246109791f..f81e396b9a4 100644
--- a/Build/source/texk/web2c/Makefile.in
+++ b/Build/source/texk/web2c/Makefile.in
@@ -1834,7 +1834,7 @@ mf_ch_src = \
mf_tests = trap.test
mpost_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/mplibdir
mpost_DEPENDENCIES = libmplib.a
-mpost_LDADD = libmplib.a $(KPATHSEA_LIBS) -lm
+mpost_LDADD = libmplib.a $(KPATHSEA_LIBS)
call_mpost_CPPFLAGS = -DEXEPROG=\"mpost.exe\"
call_mpost_SOURCES = $(srcdir)/../texlive/w32_wrapper/callexe.c
call_mpost_LDADD =
diff --git a/Build/source/texk/web2c/mplibdir/ChangeLog b/Build/source/texk/web2c/mplibdir/ChangeLog
index 0119b273a6f..9f4da35fb28 100644
--- a/Build/source/texk/web2c/mplibdir/ChangeLog
+++ b/Build/source/texk/web2c/mplibdir/ChangeLog
@@ -1,6 +1,10 @@
+2012-05-20 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * am/mplib.am (mpost_LDADD): Drop explicit '-lm'.
+
2012-05-10 Peter Breitenlohner <peb@mppmu.mpg.de>
- * lua/luainit.w: Use WEB2CVERSION.
+ * mpost.w: Use WEB2CVERSION.
2011-10-04 Peter Breitenlohner <peb@mppmu.mpg.de>
diff --git a/Build/source/texk/web2c/mplibdir/am/mplib.am b/Build/source/texk/web2c/mplibdir/am/mplib.am
index d544dcf6303..3c6cde68baa 100644
--- a/Build/source/texk/web2c/mplibdir/am/mplib.am
+++ b/Build/source/texk/web2c/mplibdir/am/mplib.am
@@ -1,6 +1,6 @@
## texk/web2c/mplibdir/am/mplib.am: Makefile fragment for MetaPost.
##
-## Copyright (C) 2009-2011 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009-2012 Peter Breitenlohner <tex-live@tug.org>
## You may freely use, modify and/or distribute this file.
## MetaPost
@@ -19,7 +19,7 @@ EXTRA_PROGRAMS += mpost
mpost_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/mplibdir
mpost_DEPENDENCIES = libmplib.a
-mpost_LDADD = libmplib.a $(KPATHSEA_LIBS) -lm
+mpost_LDADD = libmplib.a $(KPATHSEA_LIBS)
call_mpost_CPPFLAGS = -DEXEPROG=\"mpost.exe\"
call_mpost_SOURCES = $(srcdir)/../texlive/w32_wrapper/callexe.c