From ee5aa1cd03d96a21a82f5ae3d7e110800eb8bb72 Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Mon, 14 May 2012 08:33:55 +0000 Subject: more 'move old version of updmap.pl ...' git-svn-id: svn://tug.org/texlive/trunk@26359 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/tetex/ChangeLog | 6 +++++- Build/source/texk/tetex/Makefile.am | 12 +++++------- Build/source/texk/tetex/Makefile.in | 11 ++++------- 3 files changed, 14 insertions(+), 15 deletions(-) diff --git a/Build/source/texk/tetex/ChangeLog b/Build/source/texk/tetex/ChangeLog index 42781129f26..090c1b69d93 100644 --- a/Build/source/texk/tetex/ChangeLog +++ b/Build/source/texk/tetex/ChangeLog @@ -1,7 +1,11 @@ +2012-04-14 Peter Breitenlohner + + * Makefile.am: Adapt to updmap.pl => updmap-single.pl. + 2012-04-14 Norbert Preining * updmap.pl: rename to updmap-single.pl, we ship updmap.pl now - via ../texlive/updmap.pl + via ../texlive/linked_scripts/texlive/updmap.pl 2012-04-10 Karl Berry diff --git a/Build/source/texk/tetex/Makefile.am b/Build/source/texk/tetex/Makefile.am index 2a9558219bd..bdff1c1d303 100644 --- a/Build/source/texk/tetex/Makefile.am +++ b/Build/source/texk/tetex/Makefile.am @@ -1,14 +1,12 @@ ## Makefile.am for the TeX Live subdirectory texk/tetex/ ## -## Copyright (C) 2009-2011 Peter Breitenlohner +## Copyright (C) 2009-2012 Peter Breitenlohner ## You may freely use, modify and/or distribute this file. ## ACLOCAL_AMFLAGS = -I ../../m4 -EXTRA_DIST = - -perl_scripts = \ - updmap +EXTRA_DIST = \ + updmap-single.pl shell_scripts = \ updmap-sys @@ -38,7 +36,7 @@ nodist_bin_SCRIPTS = include $(srcdir)/../am/script_links.am texmfdir = $(datarootdir)/$(scriptsdir) -dist_texmf_SCRIPTS = $(perl_scripts:=.pl) $(shell_scripts:=.sh) +dist_texmf_SCRIPTS = $(shell_scripts:=.sh) if !WIN32 dist_bin_SCRIPTS = $(sh_scripts) @@ -95,7 +93,7 @@ include $(top_srcdir)/../am/man1_links.am install-exec-hook: install-bin-links -install-data-hook: install-perl-links install-shell-links install-man1-links +install-data-hook: install-shell-links install-man1-links uninstall-hook: uninstall-bin-links uninstall-links uninstall-man1-links diff --git a/Build/source/texk/tetex/Makefile.in b/Build/source/texk/tetex/Makefile.in index b8591944ac1..bb76c2de3f0 100644 --- a/Build/source/texk/tetex/Makefile.in +++ b/Build/source/texk/tetex/Makefile.in @@ -231,11 +231,8 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ ACLOCAL_AMFLAGS = -I ../../m4 -EXTRA_DIST = ../../build-aux/relpath README.texdoctk old-fontinst.bat \ - old-updmap $(TESTS) -perl_scripts = \ - updmap - +EXTRA_DIST = updmap-single.pl ../../build-aux/relpath README.texdoctk \ + old-fontinst.bat old-updmap $(TESTS) shell_scripts = \ updmap-sys @@ -264,7 +261,7 @@ all_scripts = $(lua_scripts) $(perl_scripts) $(shell_scripts) @WIN32_TRUE@@WIN32_WRAP_TRUE@wrappers = $(all_scripts:=.exe) @WIN32_TRUE@@WIN32_WRAP_TRUE@runscript = $(top_srcdir)/../../texk/texlive/w32_wrapper/runscript.exe texmfdir = $(datarootdir)/$(scriptsdir) -dist_texmf_SCRIPTS = $(perl_scripts:=.pl) $(shell_scripts:=.sh) +dist_texmf_SCRIPTS = $(shell_scripts:=.sh) @WIN32_FALSE@dist_bin_SCRIPTS = $(sh_scripts) CLEANFILES = $(nodist_bin_SCRIPTS) dist_man1_MANS = \ @@ -1098,7 +1095,7 @@ uninstall-man1-links: install-exec-hook: install-bin-links -install-data-hook: install-perl-links install-shell-links install-man1-links +install-data-hook: install-shell-links install-man1-links uninstall-hook: uninstall-bin-links uninstall-links uninstall-man1-links -- cgit v1.2.3