texlive[60940] Build/source/texk/web2c/omegafonts/Makefile.in: [w32]

commits+karl at tug.org commits+karl at tug.org
Wed Nov 3 23:47:28 CET 2021


Revision: 60940
          http://tug.org/svn/texlive?view=revision&revision=60940
Author:   karl
Date:     2021-11-03 23:47:27 +0100 (Wed, 03 Nov 2021)
Log Message:
-----------
[w32] use libtool to install intended .exe, not libtool wrapper

Modified Paths:
--------------
    trunk/Build/source/texk/dvipdfm-x/ChangeLog
    trunk/Build/source/texk/dvipdfm-x/Makefile.am
    trunk/Build/source/texk/dvipdfm-x/Makefile.in
    trunk/Build/source/texk/web2c/ChangeLog
    trunk/Build/source/texk/web2c/Makefile.in
    trunk/Build/source/texk/web2c/am/texmf.am
    trunk/Build/source/texk/web2c/omegafonts/ChangeLog
    trunk/Build/source/texk/web2c/omegafonts/Makefile.am
    trunk/Build/source/texk/web2c/omegafonts/Makefile.in

Property Changed:
----------------
    trunk/Build/source/texk/web2c/omegafonts/Makefile.am

Modified: trunk/Build/source/texk/dvipdfm-x/ChangeLog
===================================================================
--- trunk/Build/source/texk/dvipdfm-x/ChangeLog	2021-11-03 22:38:18 UTC (rev 60939)
+++ trunk/Build/source/texk/dvipdfm-x/ChangeLog	2021-11-03 22:47:27 UTC (rev 60940)
@@ -1,3 +1,10 @@
+2021-11-03  Naveen M K  <naveen521kk at gmail.com>
+
+	* Makefile.am (install-exec-hook) [WIN32]: install via libtool,
+	so as to install the real program, not just the libtool wrapper.
+	Found for msys2.
+	https://tug.org/pipermail/dvipdfmx/2021-October/000301.html
+
 2021-10-29  Marcel Fabian Kr\"uger  <tex at 2krueger.de>
 
 	* cidtype0.c: Fix a bug that dvipdfmx segfaults when embedding

Modified: trunk/Build/source/texk/dvipdfm-x/Makefile.am
===================================================================
--- trunk/Build/source/texk/dvipdfm-x/Makefile.am	2021-11-03 22:38:18 UTC (rev 60939)
+++ trunk/Build/source/texk/dvipdfm-x/Makefile.am	2021-11-03 22:47:27 UTC (rev 60940)
@@ -1,6 +1,7 @@
 ## Makefile.am for the TeX Live subdirectory texk/dvipdfm-x/
 ##
-## Copyright (C) 2009-2015 Peter Breitenlohner <tex-live at tug.org>
+## Copyright 2015-2021 Karl Berry <tex-live at tug.org>
+## Copyright 2009-2015 Peter Breitenlohner <tex-live at tug.org>
 ## You may freely use, modify and/or distribute this file.
 ##
 bin_PROGRAMS = xdvipdfmx
@@ -209,10 +210,11 @@
 
 install-exec-hook: install-bin-links
 if WIN32
-	$(INSTALL_PROGRAM) call_xdvipdfmx$(EXEEXT) $(DESTDIR)$(bindir)/dvipdfm$(EXEEXT)
-	$(INSTALL_PROGRAM) call_xdvipdfmx$(EXEEXT) $(DESTDIR)$(bindir)/dvipdfmx$(EXEEXT)
-	$(INSTALL_PROGRAM) call_xdvipdfmx$(EXEEXT) $(DESTDIR)$(bindir)/ebb$(EXEEXT)
-	$(INSTALL_PROGRAM) call_xdvipdfmx$(EXEEXT) $(DESTDIR)$(bindir)/extractbb$(EXEEXT)
+# same install happens in web2c/omegafonts.
+	$(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) call_xdvipdfmx$(EXEEXT) "$(DESTDIR)$(bindir)/dvipdfm$(EXEEXT)"
+	$(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) call_xdvipdfmx$(EXEEXT) "$(DESTDIR)$(bindir)/dvipdfmx$(EXEEXT)"
+	$(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) call_xdvipdfmx$(EXEEXT) "$(DESTDIR)$(bindir)/ebb$(EXEEXT)"
+	$(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) call_xdvipdfmx$(EXEEXT) "$(DESTDIR)$(bindir)/extractbb$(EXEEXT)"
 endif WIN32
 
 install-data-hook: install-man1-links

Modified: trunk/Build/source/texk/dvipdfm-x/Makefile.in
===================================================================
--- trunk/Build/source/texk/dvipdfm-x/Makefile.in	2021-11-03 22:38:18 UTC (rev 60939)
+++ trunk/Build/source/texk/dvipdfm-x/Makefile.in	2021-11-03 22:47:27 UTC (rev 60940)
@@ -2001,10 +2001,11 @@
 	done
 
 install-exec-hook: install-bin-links
- at WIN32_TRUE@	$(INSTALL_PROGRAM) call_xdvipdfmx$(EXEEXT) $(DESTDIR)$(bindir)/dvipdfm$(EXEEXT)
- at WIN32_TRUE@	$(INSTALL_PROGRAM) call_xdvipdfmx$(EXEEXT) $(DESTDIR)$(bindir)/dvipdfmx$(EXEEXT)
- at WIN32_TRUE@	$(INSTALL_PROGRAM) call_xdvipdfmx$(EXEEXT) $(DESTDIR)$(bindir)/ebb$(EXEEXT)
- at WIN32_TRUE@	$(INSTALL_PROGRAM) call_xdvipdfmx$(EXEEXT) $(DESTDIR)$(bindir)/extractbb$(EXEEXT)
+# same install happens in web2c/omegafonts.
+ at WIN32_TRUE@	$(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) call_xdvipdfmx$(EXEEXT) "$(DESTDIR)$(bindir)/dvipdfm$(EXEEXT)"
+ at WIN32_TRUE@	$(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) call_xdvipdfmx$(EXEEXT) "$(DESTDIR)$(bindir)/dvipdfmx$(EXEEXT)"
+ at WIN32_TRUE@	$(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) call_xdvipdfmx$(EXEEXT) "$(DESTDIR)$(bindir)/ebb$(EXEEXT)"
+ at WIN32_TRUE@	$(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) call_xdvipdfmx$(EXEEXT) "$(DESTDIR)$(bindir)/extractbb$(EXEEXT)"
 
 install-data-hook: install-man1-links
 

Modified: trunk/Build/source/texk/web2c/ChangeLog
===================================================================
--- trunk/Build/source/texk/web2c/ChangeLog	2021-11-03 22:38:18 UTC (rev 60939)
+++ trunk/Build/source/texk/web2c/ChangeLog	2021-11-03 22:47:27 UTC (rev 60940)
@@ -1,3 +1,9 @@
+2021-11-03  Karl Berry  <karl at freefriends.org>
+
+	* am/texmf.am (install-mf-links) [WIN32]: install via libtool,
+	the same change as made for dvipdfmx.
+	https://tug.org/pipermail/dvipdfmx/2021-October/000301.html
+
 2021-10-11  Andreas Scherer  <https://ascherer.github.io>
 
 	* ctangleboot.cin,

Modified: trunk/Build/source/texk/web2c/Makefile.in
===================================================================
--- trunk/Build/source/texk/web2c/Makefile.in	2021-11-03 22:38:18 UTC (rev 60939)
+++ trunk/Build/source/texk/web2c/Makefile.in	2021-11-03 22:47:27 UTC (rev 60940)
@@ -21554,8 +21554,8 @@
 
 .PHONY: install-mf-links uninstall-mf-links
 @WIN32_TRUE at install-mf-links: call_mf$(EXEEXT)
- at MFN_FALSE@@WIN32_TRUE@	$(INSTALL_PROGRAM) call_mf$(EXEEXT) $(DESTDIR)$(bindir)/mf-nowin$(EXEEXT)
- at WIN32_TRUE@	$(INSTALL_PROGRAM) call_mf$(EXEEXT) $(DESTDIR)$(bindir)/inimf$(EXEEXT)
+ at MFN_FALSE@@WIN32_TRUE@	$(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) call_mf$(EXEEXT) "$(DESTDIR)$(bindir)/mf-nowin$(EXEEXT)"
+ at WIN32_TRUE@	$(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) call_mf$(EXEEXT) "$(DESTDIR)$(bindir)/inimf$(EXEEXT)"
 @WIN32_TRUE at uninstall-mf-links:
 @MFN_FALSE@@WIN32_TRUE@	rm -f $(DESTDIR)$(bindir)/mf-nowin$(EXEEXT)
 @WIN32_TRUE@	rm -f $(DESTDIR)$(bindir)/inimf$(EXEEXT)

Modified: trunk/Build/source/texk/web2c/am/texmf.am
===================================================================
--- trunk/Build/source/texk/web2c/am/texmf.am	2021-11-03 22:38:18 UTC (rev 60939)
+++ trunk/Build/source/texk/web2c/am/texmf.am	2021-11-03 22:47:27 UTC (rev 60940)
@@ -1,7 +1,7 @@
 ## $Id$
 ## texk/web2c/am/texmf.am: Makefile fragment for TeX and MF.
 ##
-## Copyright 2015-2019 Karl Berry <tex-live at tug.org>
+## Copyright 2015-2021 Karl Berry <tex-live at tug.org>
 ## Copyright 2009-2015 Peter Breitenlohner <tex-live at tug.org>
 ## You may freely use, modify and/or distribute this file.
 
@@ -128,9 +128,9 @@
 if WIN32
 install-mf-links: call_mf$(EXEEXT)
 if !MFN
-	$(INSTALL_PROGRAM) call_mf$(EXEEXT) $(DESTDIR)$(bindir)/mf-nowin$(EXEEXT)
+	$(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) call_mf$(EXEEXT) "$(DESTDIR)$(bindir)/mf-nowin$(EXEEXT)"
 endif !MFN
-	$(INSTALL_PROGRAM) call_mf$(EXEEXT) $(DESTDIR)$(bindir)/inimf$(EXEEXT)
+	$(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) call_mf$(EXEEXT) "$(DESTDIR)$(bindir)/inimf$(EXEEXT)"
 uninstall-mf-links:
 if !MFN
 	rm -f $(DESTDIR)$(bindir)/mf-nowin$(EXEEXT)

Modified: trunk/Build/source/texk/web2c/omegafonts/ChangeLog
===================================================================
--- trunk/Build/source/texk/web2c/omegafonts/ChangeLog	2021-11-03 22:38:18 UTC (rev 60939)
+++ trunk/Build/source/texk/web2c/omegafonts/ChangeLog	2021-11-03 22:47:27 UTC (rev 60940)
@@ -1,3 +1,9 @@
+2021-11-03  Karl Berry  <karl at freefriends.org>
+
+	* Makefile.am (install-exec-hook) [WIN32]: install via libtool,
+	the same change as made for dvipdfmx.
+	https://tug.org/pipermail/dvipdfmx/2021-October/000301.html
+
 2020-12-04  Karl Berry  <karl at freefriends.org>
 
 	* pl-lexer.l (YY_BUF_SIZE): #define 110000, for the same

Modified: trunk/Build/source/texk/web2c/omegafonts/Makefile.am
===================================================================
--- trunk/Build/source/texk/web2c/omegafonts/Makefile.am	2021-11-03 22:38:18 UTC (rev 60939)
+++ trunk/Build/source/texk/web2c/omegafonts/Makefile.am	2021-11-03 22:47:27 UTC (rev 60940)
@@ -1,6 +1,8 @@
+## $Id$
 ## Makefile.am for the TeX Live subdirectory texk/web2c/omegafonts/
 ##
-## Copyright (C) 2009-2015 Peter Breitenlohner <tex-live at tug.org>
+## Copyright 2015-2021 Karl Berry <tex-live at tug.org>
+## Copyright 2009-2015 Peter Breitenlohner <tex-live at tug.org>
 ## You may freely use, modify and/or distribute this file.
 ##
 AM_CPPFLAGS =  -I$(top_builddir)/.. -I$(top_srcdir) $(KPATHSEA_INCLUDES) -DNOT_WEB2C
@@ -82,8 +84,9 @@
 if OTANGLE
 install-exec-hook: install-bin-links
 if WIN32
+# same install happens in dvipdfmx.
 	for f in $(linked_programs); do \
-	  $(INSTALL_PROGRAM) call_omfonts$(EXEEXT) $(DESTDIR)$(bindir)/$$f$(EXEEXT) || exit 1; \
+	  $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) call_omfonts$(EXEEXT) "$(DESTDIR)$(bindir)/$$f$(EXEEXT)"
 	done
 endif WIN32
 uninstall-hook: uninstall-bin-links


Property changes on: trunk/Build/source/texk/web2c/omegafonts/Makefile.am
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Date Author Id Revision
\ No newline at end of property
Modified: trunk/Build/source/texk/web2c/omegafonts/Makefile.in
===================================================================
--- trunk/Build/source/texk/web2c/omegafonts/Makefile.in	2021-11-03 22:38:18 UTC (rev 60939)
+++ trunk/Build/source/texk/web2c/omegafonts/Makefile.in	2021-11-03 22:47:27 UTC (rev 60940)
@@ -1425,8 +1425,9 @@
 @WIN32_FALSE@	done
 
 @OTANGLE_TRUE at install-exec-hook: install-bin-links
+# same install happens in dvipdfmx.
 @OTANGLE_TRUE@@WIN32_TRUE@	for f in $(linked_programs); do \
- at OTANGLE_TRUE@@WIN32_TRUE@	  $(INSTALL_PROGRAM) call_omfonts$(EXEEXT) $(DESTDIR)$(bindir)/$$f$(EXEEXT) || exit 1; \
+ at OTANGLE_TRUE@@WIN32_TRUE@	  $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) call_omfonts$(EXEEXT) "$(DESTDIR)$(bindir)/$$f$(EXEEXT)"
 @OTANGLE_TRUE@@WIN32_TRUE@	done
 @OTANGLE_TRUE at uninstall-hook: uninstall-bin-links
 @OTANGLE_TRUE@@WIN32_TRUE@	for f in $(linked_programs); do \



More information about the tex-live-commits mailing list.