From 15cca88e2666b7aae4e54112a21cb5c9bc312069 Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Tue, 31 May 2011 09:47:04 +0000 Subject: Use the Makefile fragment `bin_links.am' to create symlinks within $(bindir) For cygwin always create links `foo->bar.exe' and not `foo.exe->bar.exe' git-svn-id: svn://tug.org/texlive/trunk@22701 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/web2c/mplibdir/ChangeLog | 7 +++++++ Build/source/texk/web2c/mplibdir/am/mplib.am | 26 ++++++++++++++++++++------ 2 files changed, 27 insertions(+), 6 deletions(-) (limited to 'Build/source/texk/web2c/mplibdir') diff --git a/Build/source/texk/web2c/mplibdir/ChangeLog b/Build/source/texk/web2c/mplibdir/ChangeLog index 2ef996a7667..f653ba77876 100644 --- a/Build/source/texk/web2c/mplibdir/ChangeLog +++ b/Build/source/texk/web2c/mplibdir/ChangeLog @@ -1,3 +1,10 @@ +2011-05-31 Peter Breitenlohner + + * Makefile.am (bin_links): Move mpost:metafun and mpost:mfplain + from ../../texlive/linked_scripts/ to here. + [MinGW]: Build call_mpost.exe wrapper binary and install as + dvitomp.exe, metafun.exe, amd mfplain.exe. + 2011-05-30 Taco Hoekwater * all files: clarify that base MetaPost is public domain, diff --git a/Build/source/texk/web2c/mplibdir/am/mplib.am b/Build/source/texk/web2c/mplibdir/am/mplib.am index ceed30b9227..ca8c52a512b 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 +## Copyright (C) 2009-2011 Peter Breitenlohner ## You may freely use, modify and/or distribute this file. ## MetaPost @@ -8,9 +8,11 @@ if MP bin_PROGRAMS += mpost if WIN32 -bin_PROGRAMS += dvitomp +noinst_PROGRAMS += call_mpost +install_exe_links += install-mpost-links +uninstall_exe_links += uninstall-mpost-links else !WIN32 -bin_links += mpost:dvitomp +bin_links += mpost$(EXEEXT):dvitomp mpost$(EXEEXT):metafun mpost$(EXEEXT):mfplain endif !WIN32 endif MP EXTRA_PROGRAMS += mpost @@ -19,9 +21,21 @@ mpost_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/mplibdir mpost_DEPENDENCIES = libmplib.a mpost_LDADD = libmplib.a $(KPATHSEA_LIBS) -lm -dvitomp_CPPFLAGS = -DEXEPROG=\"mpost.exe\" -dvitomp_SOURCES = $(srcdir)/../texlive/w32_wrapper/callexe.c -dvitomp_LDADD = +call_mpost_CPPFLAGS = -DEXEPROG=\"mpost.exe\" +call_mpost_SOURCES = $(srcdir)/../texlive/w32_wrapper/callexe.c +call_mpost_LDADD = + +.PHONY: install-mpost-links uninstall-mpost-links +if WIN32 +install-mpost-links: call_mpost$(EXEEXT) + $(INSTALL_PROGRAM) call_mpost$(EXEEXT) $(DESTDIR)$(bindir)/dvitomp$(EXEEXT) + $(INSTALL_PROGRAM) call_mpost$(EXEEXT) $(DESTDIR)$(bindir)/metafun$(EXEEXT) + $(INSTALL_PROGRAM) call_mpost$(EXEEXT) $(DESTDIR)$(bindir)/mfplain$(EXEEXT) +uninstall-mpost-links: + rm -f $(DESTDIR)$(bindir)/dvitomp$(EXEEXT) + rm -f $(DESTDIR)$(bindir)/metafun$(EXEEXT) + rm -f $(DESTDIR)$(bindir)/mfplain$(EXEEXT) +endif WIN32 # Creating one file: just one rule mp_ctangle = CWEBINPUTS=$(srcdir)/mplibdir $(ctangle) -- cgit v1.2.3