summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2011-01-07 11:45:38 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2011-01-07 11:45:38 +0000
commitf7313120e22d6aa6b949b94452216f43d3037099 (patch)
tree08b17db4a54cd506953613094e59f80d89eaef95 /Build
parentb193da52395b4e98368f28044ae107d33df6d9d0 (diff)
Install WIN32 wrapper binary for fontinst
Drop texconfig_sys shell variable in texconfig{,-sys} git-svn-id: svn://tug.org/texlive/trunk@20962 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r--Build/source/texk/tetex/ChangeLog8
-rw-r--r--Build/source/texk/tetex/Makefile.am23
-rw-r--r--Build/source/texk/tetex/Makefile.in141
-rwxr-xr-xBuild/source/texk/tetex/configure14
-rw-r--r--Build/source/texk/tetex/configure.ac2
-rwxr-xr-xBuild/source/texk/tetex/texconfig14
-rwxr-xr-xBuild/source/texk/tetex/texconfig-sys1
7 files changed, 121 insertions, 82 deletions
diff --git a/Build/source/texk/tetex/ChangeLog b/Build/source/texk/tetex/ChangeLog
index f1556f3e5a1..53425763f96 100644
--- a/Build/source/texk/tetex/ChangeLog
+++ b/Build/source/texk/tetex/ChangeLog
@@ -1,3 +1,11 @@
+2011-01-07 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am, configure.ac [WIN32]: Install wrapper binary for
+ fontinst (handled as alias by runscript.tlu).
+
+ * texconfig, texconfig-sys: Drop texconfig_sys shell variable;
+ now done via TEXMFVAR and TEXMFCONFIG in the environment.
+
2011-01-04 Karl Berry <karl@tug.org>
* updmap: add many more verbose messages, to help understand what
diff --git a/Build/source/texk/tetex/Makefile.am b/Build/source/texk/tetex/Makefile.am
index c4d9bf0f8b9..46541eaa7ae 100644
--- a/Build/source/texk/tetex/Makefile.am
+++ b/Build/source/texk/tetex/Makefile.am
@@ -5,8 +5,7 @@
##
ACLOCAL_AMFLAGS = -I ../../m4
-if !WIN32
-dist_bin_SCRIPTS = \
+shell_scripts = \
allcm \
allneeded \
dvi2fax \
@@ -26,8 +25,26 @@ dist_bin_SCRIPTS = \
texlinks \
updmap \
updmap-sys
+
+## Handled as alias by runscript.tlu
+win32_aliases = \
+ fontinst.exe
+
+if WIN32
+if WIN32_WRAP
+## We treat the WIN32 aliases as SCRIPTS to avoid automatic build rules
+nodist_bin_SCRIPTS = $(win32_aliases)
+runscript = $(srcdir)/../texlive/w32_wrapper/runscript.exe
+$(win32_aliases): $(runscript)
+ $(LN_S) $(runscript) $@
+endif WIN32_WRAP
+else !WIN32
+nodist_bin_SCRIPTS = $(shell_scripts)
endif !WIN32
+EXTRA_DIST = $(shell_scripts)
+CLEANFILES = $(win32_aliases)
+
dist_man1_MANS = \
allcm.man \
allec.man \
@@ -119,7 +136,7 @@ endif !WIN32
rm -f $(DESTDIR)$(man1dir)/$$link.1; \
done
-EXTRA_DIST = \
+EXTRA_DIST += \
README.texdoctk
## Not used
diff --git a/Build/source/texk/tetex/Makefile.in b/Build/source/texk/tetex/Makefile.in
index 89102e88d02..11145c49854 100644
--- a/Build/source/texk/tetex/Makefile.in
+++ b/Build/source/texk/tetex/Makefile.in
@@ -34,8 +34,8 @@ NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
subdir = .
-DIST_COMMON = $(am__configure_deps) $(am__dist_bin_SCRIPTS_DIST) \
- $(dist_man1_MANS) $(dist_man5_MANS) $(dist_texconfig_DATA) \
+DIST_COMMON = $(am__configure_deps) $(dist_man1_MANS) \
+ $(dist_man5_MANS) $(dist_texconfig_DATA) \
$(dist_texconfig_SCRIPTS) $(dist_web2c_DATA) \
$(nobase_dist_texconf_DATA) \
$(srcdir)/../../build-aux/install-sh \
@@ -55,10 +55,6 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
mkinstalldirs = $(install_sh) -d
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
-am__dist_bin_SCRIPTS_DIST = allcm allneeded dvi2fax dvired fmtutil \
- fmtutil-sys fontinst kpsetool kpsewhere ps2frag pslatex \
- rubibtex rumakeindex texconfig texconfig-dialog texconfig-sys \
- texlinks updmap updmap-sys
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -80,11 +76,11 @@ am__nobase_list = $(am__nobase_strip_setup); \
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(texconfigdir)" \
+am__installdirs = "$(DESTDIR)$(texconfigdir)" "$(DESTDIR)$(bindir)" \
"$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)" \
"$(DESTDIR)$(texconfigdir)" "$(DESTDIR)$(web2cdir)" \
"$(DESTDIR)$(texconfdir)"
-SCRIPTS = $(dist_bin_SCRIPTS) $(dist_texconfig_SCRIPTS)
+SCRIPTS = $(dist_texconfig_SCRIPTS) $(nodist_bin_SCRIPTS)
SOURCES =
DIST_SOURCES =
man1dir = $(mandir)/man1
@@ -190,27 +186,35 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
ACLOCAL_AMFLAGS = -I ../../m4
-@WIN32_FALSE@dist_bin_SCRIPTS = \
-@WIN32_FALSE@ allcm \
-@WIN32_FALSE@ allneeded \
-@WIN32_FALSE@ dvi2fax \
-@WIN32_FALSE@ dvired \
-@WIN32_FALSE@ fmtutil \
-@WIN32_FALSE@ fmtutil-sys \
-@WIN32_FALSE@ fontinst \
-@WIN32_FALSE@ kpsetool \
-@WIN32_FALSE@ kpsewhere \
-@WIN32_FALSE@ ps2frag \
-@WIN32_FALSE@ pslatex \
-@WIN32_FALSE@ rubibtex \
-@WIN32_FALSE@ rumakeindex \
-@WIN32_FALSE@ texconfig \
-@WIN32_FALSE@ texconfig-dialog \
-@WIN32_FALSE@ texconfig-sys \
-@WIN32_FALSE@ texlinks \
-@WIN32_FALSE@ updmap \
-@WIN32_FALSE@ updmap-sys
-
+shell_scripts = \
+ allcm \
+ allneeded \
+ dvi2fax \
+ dvired \
+ fmtutil \
+ fmtutil-sys \
+ fontinst \
+ kpsetool \
+ kpsewhere \
+ ps2frag \
+ pslatex \
+ rubibtex \
+ rumakeindex \
+ texconfig \
+ texconfig-dialog \
+ texconfig-sys \
+ texlinks \
+ updmap \
+ updmap-sys
+
+win32_aliases = \
+ fontinst.exe
+
+@WIN32_FALSE@nodist_bin_SCRIPTS = $(shell_scripts)
+@WIN32_TRUE@@WIN32_WRAP_TRUE@nodist_bin_SCRIPTS = $(win32_aliases)
+@WIN32_TRUE@@WIN32_WRAP_TRUE@runscript = $(srcdir)/../texlive/w32_wrapper/runscript.exe
+EXTRA_DIST = $(shell_scripts) README.texdoctk fontinst.bat updmap.pl
+CLEANFILES = $(win32_aliases)
dist_man1_MANS = \
allcm.man \
allec.man \
@@ -264,7 +268,6 @@ man1_links = $(bin_links) \
texconfig:texconfig-sys \
updmap:updmap-sys
-EXTRA_DIST = README.texdoctk fontinst.bat updmap.pl
run_texlinks = $(DESTDIR)$(bindir)/texlinks -v \
-f $(DESTDIR)$(web2cdir)/fmtutil.cnf \
-e "$(EXEEXT)" $(DESTDIR)$(bindir)
@@ -306,10 +309,10 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
$(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
$(am__aclocal_m4_deps):
-install-dist_binSCRIPTS: $(dist_bin_SCRIPTS)
+install-dist_texconfigSCRIPTS: $(dist_texconfig_SCRIPTS)
@$(NORMAL_INSTALL)
- test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
- @list='$(dist_bin_SCRIPTS)'; test -n "$(bindir)" || list=; \
+ test -z "$(texconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(texconfigdir)"
+ @list='$(dist_texconfig_SCRIPTS)'; test -n "$(texconfigdir)" || list=; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
@@ -327,23 +330,23 @@ install-dist_binSCRIPTS: $(dist_bin_SCRIPTS)
while read type dir files; do \
if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
test -z "$$files" || { \
- echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(bindir)$$dir'"; \
- $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
+ echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(texconfigdir)$$dir'"; \
+ $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(texconfigdir)$$dir" || exit $$?; \
} \
; done
-uninstall-dist_binSCRIPTS:
+uninstall-dist_texconfigSCRIPTS:
@$(NORMAL_UNINSTALL)
- @list='$(dist_bin_SCRIPTS)'; test -n "$(bindir)" || exit 0; \
+ @list='$(dist_texconfig_SCRIPTS)'; test -n "$(texconfigdir)" || exit 0; \
files=`for p in $$list; do echo "$$p"; done | \
sed -e 's,.*/,,;$(transform)'`; \
test -n "$$list" || exit 0; \
- echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(bindir)" && rm -f $$files
-install-dist_texconfigSCRIPTS: $(dist_texconfig_SCRIPTS)
+ echo " ( cd '$(DESTDIR)$(texconfigdir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(texconfigdir)" && rm -f $$files
+install-nodist_binSCRIPTS: $(nodist_bin_SCRIPTS)
@$(NORMAL_INSTALL)
- test -z "$(texconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(texconfigdir)"
- @list='$(dist_texconfig_SCRIPTS)'; test -n "$(texconfigdir)" || list=; \
+ test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
+ @list='$(nodist_bin_SCRIPTS)'; test -n "$(bindir)" || list=; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
@@ -361,19 +364,19 @@ install-dist_texconfigSCRIPTS: $(dist_texconfig_SCRIPTS)
while read type dir files; do \
if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
test -z "$$files" || { \
- echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(texconfigdir)$$dir'"; \
- $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(texconfigdir)$$dir" || exit $$?; \
+ echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(bindir)$$dir'"; \
+ $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
} \
; done
-uninstall-dist_texconfigSCRIPTS:
+uninstall-nodist_binSCRIPTS:
@$(NORMAL_UNINSTALL)
- @list='$(dist_texconfig_SCRIPTS)'; test -n "$(texconfigdir)" || exit 0; \
+ @list='$(nodist_bin_SCRIPTS)'; test -n "$(bindir)" || exit 0; \
files=`for p in $$list; do echo "$$p"; done | \
sed -e 's,.*/,,;$(transform)'`; \
test -n "$$list" || exit 0; \
- echo " ( cd '$(DESTDIR)$(texconfigdir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(texconfigdir)" && rm -f $$files
+ echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(bindir)" && rm -f $$files
install-man1: $(dist_man1_MANS)
@$(NORMAL_INSTALL)
test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
@@ -676,7 +679,7 @@ check-am: all-am
check: check-am
all-am: Makefile $(SCRIPTS) $(MANS) $(DATA)
installdirs:
- for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(texconfigdir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(texconfigdir)" "$(DESTDIR)$(web2cdir)" "$(DESTDIR)$(texconfdir)"; do \
+ for dir in "$(DESTDIR)$(texconfigdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(texconfigdir)" "$(DESTDIR)$(web2cdir)" "$(DESTDIR)$(texconfdir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-am
@@ -696,6 +699,7 @@ install-strip:
mostlyclean-generic:
clean-generic:
+ -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -734,7 +738,7 @@ install-dvi: install-dvi-am
install-dvi-am:
-install-exec-am: install-dist_binSCRIPTS
+install-exec-am: install-nodist_binSCRIPTS
@$(NORMAL_INSTALL)
$(MAKE) $(AM_MAKEFLAGS) install-exec-hook
install-html: install-html-am
@@ -775,9 +779,10 @@ ps: ps-am
ps-am:
-uninstall-am: uninstall-dist_binSCRIPTS uninstall-dist_texconfigDATA \
+uninstall-am: uninstall-dist_texconfigDATA \
uninstall-dist_texconfigSCRIPTS uninstall-dist_web2cDATA \
- uninstall-man uninstall-nobase_dist_texconfDATA
+ uninstall-man uninstall-nobase_dist_texconfDATA \
+ uninstall-nodist_binSCRIPTS
@$(NORMAL_INSTALL)
$(MAKE) $(AM_MAKEFLAGS) uninstall-hook
uninstall-man: uninstall-man1 uninstall-man5
@@ -790,21 +795,23 @@ uninstall-man: uninstall-man1 uninstall-man5
dist-xz dist-zip distcheck distclean distclean-generic \
distcleancheck distdir distuninstallcheck dvi dvi-am html \
html-am info info-am install install-am install-data \
- install-data-am install-data-hook install-dist_binSCRIPTS \
- install-dist_texconfigDATA install-dist_texconfigSCRIPTS \
- install-dist_web2cDATA install-dvi install-dvi-am install-exec \
- install-exec-am install-exec-hook install-html install-html-am \
- install-info install-info-am install-man install-man1 \
- install-man5 install-nobase_dist_texconfDATA install-pdf \
- install-pdf-am install-ps install-ps-am install-strip \
- installcheck installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
- pdf-am ps ps-am uninstall uninstall-am \
- uninstall-dist_binSCRIPTS uninstall-dist_texconfigDATA \
- uninstall-dist_texconfigSCRIPTS uninstall-dist_web2cDATA \
- uninstall-hook uninstall-man uninstall-man1 uninstall-man5 \
- uninstall-nobase_dist_texconfDATA
-
+ install-data-am install-data-hook install-dist_texconfigDATA \
+ install-dist_texconfigSCRIPTS install-dist_web2cDATA \
+ install-dvi install-dvi-am install-exec install-exec-am \
+ install-exec-hook install-html install-html-am install-info \
+ install-info-am install-man install-man1 install-man5 \
+ install-nobase_dist_texconfDATA install-nodist_binSCRIPTS \
+ install-pdf install-pdf-am install-ps install-ps-am \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am \
+ uninstall-dist_texconfigDATA uninstall-dist_texconfigSCRIPTS \
+ uninstall-dist_web2cDATA uninstall-hook uninstall-man \
+ uninstall-man1 uninstall-man5 \
+ uninstall-nobase_dist_texconfDATA uninstall-nodist_binSCRIPTS
+
+@WIN32_TRUE@@WIN32_WRAP_TRUE@$(win32_aliases): $(runscript)
+@WIN32_TRUE@@WIN32_WRAP_TRUE@ $(LN_S) $(runscript) $@
install-exec-hook:
@WIN32_FALSE@ @cd $(DESTDIR)$(bindir) && \
diff --git a/Build/source/texk/tetex/configure b/Build/source/texk/tetex/configure
index 41b7e6a67f5..e1ad58e1f7e 100755
--- a/Build/source/texk/tetex/configure
+++ b/Build/source/texk/tetex/configure
@@ -569,6 +569,8 @@ ac_subst_vars='am__EXEEXT_FALSE
am__EXEEXT_TRUE
LTLIBOBJS
LIBOBJS
+WIN32_WRAP_FALSE
+WIN32_WRAP_TRUE
WIN32_FALSE
WIN32_TRUE
LN_S
@@ -3379,6 +3381,14 @@ else
WIN32_FALSE=
fi
+ if test -r $srcdir/../texlive/w32_wrapper/runscript.exe; then
+ WIN32_WRAP_TRUE=
+ WIN32_WRAP_FALSE='#'
+else
+ WIN32_WRAP_TRUE='#'
+ WIN32_WRAP_FALSE=
+fi
+
ac_config_files="$ac_config_files Makefile"
@@ -3552,6 +3562,10 @@ if test -z "${WIN32_TRUE}" && test -z "${WIN32_FALSE}"; then
as_fn_error $? "conditional \"WIN32\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
+if test -z "${WIN32_WRAP_TRUE}" && test -z "${WIN32_WRAP_FALSE}"; then
+ as_fn_error $? "conditional \"WIN32_WRAP\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
: "${CONFIG_STATUS=./config.status}"
ac_write_fail=0
diff --git a/Build/source/texk/tetex/configure.ac b/Build/source/texk/tetex/configure.ac
index c2e6d993be6..4562c108782 100644
--- a/Build/source/texk/tetex/configure.ac
+++ b/Build/source/texk/tetex/configure.ac
@@ -22,6 +22,8 @@ AC_PROG_MAKE_SET
KPSE_CHECK_WIN32
AM_CONDITIONAL([WIN32], [test "x$kpse_cv_have_win32" != xno])
+AM_CONDITIONAL([WIN32_WRAP],
+ [test -r $srcdir/../texlive/w32_wrapper/runscript.exe])
AC_CONFIG_FILES([Makefile])
diff --git a/Build/source/texk/tetex/texconfig b/Build/source/texk/tetex/texconfig
index f37b30b1283..c9cc73c8305 100755
--- a/Build/source/texk/tetex/texconfig
+++ b/Build/source/texk/tetex/texconfig
@@ -1150,19 +1150,11 @@ $formatsForHyphenFmt"
;;
init)
- if test -n "$texconfig_sys"; then # set by texconfig-sys
- fmtutil=fmtutil-sys
- updmap=updmap-sys
- else
- fmtutil=fmtutil
- updmap=updmap
- fi
-
case $2 in
"")
- if $fmtutil --all \
+ if fmtutil --all \
&& texlinks --multiplatform \
- && $updmap; then
+ && updmap; then
:
else
rc=1
@@ -1171,7 +1163,7 @@ $formatsForHyphenFmt"
*)
shift 1
for i in "$@"; do
- $fmtutil --byfmt "$i" || rc=1
+ fmtutil --byfmt "$i" || rc=1
done
;;
esac
diff --git a/Build/source/texk/tetex/texconfig-sys b/Build/source/texk/tetex/texconfig-sys
index a67854789c4..dd58513a6ea 100755
--- a/Build/source/texk/tetex/texconfig-sys
+++ b/Build/source/texk/tetex/texconfig-sys
@@ -26,7 +26,6 @@ c=`kpsewhich -var-value TEXMFSYSCONFIG`
TEXMFVAR="$v"
TEXMFCONFIG="$c"
-texconfig_sys=1
export TEXMFVAR TEXMFCONFIG
exec texconfig ${1+"$@"}