diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2015-07-03 08:56:39 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2015-07-03 08:56:39 +0000 |
commit | 427855f6f99e9044c3496248c1f47f8a28ac10fc (patch) | |
tree | d47c78e5af65086d4e5f64bc41d76bb988f3d05f /Build/source/texk/web2c/mfluajitdir | |
parent | 8668b871887c39f8aae7f3a8b6793ef4d7334c22 (diff) |
METAFONT: Always create mf*-nowin, either as separate program or as symlink
git-svn-id: svn://tug.org/texlive/trunk@37742 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/web2c/mfluajitdir')
-rw-r--r-- | Build/source/texk/web2c/mfluajitdir/ChangeLog | 5 | ||||
-rw-r--r-- | Build/source/texk/web2c/mfluajitdir/am/mfluajit.am | 27 |
2 files changed, 28 insertions, 4 deletions
diff --git a/Build/source/texk/web2c/mfluajitdir/ChangeLog b/Build/source/texk/web2c/mfluajitdir/ChangeLog index be63880f2eb..372e194fe55 100644 --- a/Build/source/texk/web2c/mfluajitdir/ChangeLog +++ b/Build/source/texk/web2c/mfluajitdir/ChangeLog @@ -1,3 +1,8 @@ +2015-07-03 Peter Breitenlohner <peb@mppmu.mpg.de> + + * am/mfluajit.am: Always create mfluajit-nowin, either as extra + program or as symlink. + 2015-07-02 Peter Breitenlohner <peb@mppmu.mpg.de> * mfluajittraptest: Use ../mfluadir/mfluatrap/*.lua files. diff --git a/Build/source/texk/web2c/mfluajitdir/am/mfluajit.am b/Build/source/texk/web2c/mfluajitdir/am/mfluajit.am index 501c983c4cd..bbf3cd52e79 100644 --- a/Build/source/texk/web2c/mfluajitdir/am/mfluajit.am +++ b/Build/source/texk/web2c/mfluajitdir/am/mfluajit.am @@ -11,17 +11,36 @@ if MFLUAJITN bin_PROGRAMS += mfluajit-nowin endif MFLUAJITN if WIN32 -bin_PROGRAMS += inimfluajit +noinst_PROGRAMS += call_mfluajit +install_exe_links += install-mfluajit-links +uninstall_exe_links += uninstall-mfluajit-links else !WIN32 +if !MFLUAJITN +bin_links += mfluajit$(EXEEXT):mfluajit-nowin +endif !MFLUAJITN bin_links += mfluajit$(EXEEXT):inimfluajit endif !WIN32 endif MFLUAJIT EXTRA_PROGRAMS += mfluajit mfluajit-nowin DISTCLEANFILES += mfluajittrap.diffs -inimfluajit_CPPFLAGS = -DEXEPROG=\"mfluajit.exe\" -nodist_inimfluajit_SOURCES = callexe.c -inimfluajit_LDADD = +call_mfluajit_CPPFLAGS = -DEXEPROG=\"mfluajit.exe\" +nodist_call_mfluajit_SOURCES = callexe.c +call_mfluajit_LDADD = + +.PHONY: install-mfluajit-links uninstall-mfluajit-links +if WIN32 +install-mfluajit-links: call_mfluajit$(EXEEXT) +if !MFLUAJITN + $(INSTALL_PROGRAM) call_mfluajit$(EXEEXT) $(DESTDIR)$(bindir)/mfluajit-nowin$(EXEEXT) +endif !MFLUAJITN + $(INSTALL_PROGRAM) call_mfluajit$(EXEEXT) $(DESTDIR)$(bindir)/inimfluajit$(EXEEXT) +uninstall-mfluajit-links: +if !MFLUAJITN + rm -f $(DESTDIR)$(bindir)/mfluajit-nowin$(EXEEXT) +endif !MFLUAJITN + rm -f $(DESTDIR)$(bindir)/inimfluajit$(EXEEXT) +endif WIN32 dist_mfluajit_SOURCES = mfluajitdir/mfluajitextra.c mfluajitdir/mfluajitextra.h mfluadir/mflua_version.h mfluajit_CPPFLAGS = $(AM_CPPFLAGS) $(X_CFLAGS) $(LUAJIT_INCLUDES) $(LUAJIT_DEFINES) |