Build system: Move fmtutil-sys.sh and updmap-sys.sh from tl_scripts to linked_scripts

git-svn-id: svn://tug.org/texlive/trunk@36968 c570f23f-e606-0410-a88d-b1316a301751

10 files changed, 23 insertions, 13 deletions

diff --git a/Build/source/texk/texlive/linked_scripts/ChangeLog b/Build/source/texk/texlive/linked_scripts/ChangeLog
index a88b7722494..3f95aec0c7a 100644
--- a/Build/source/texk/texlive/linked_scripts/ChangeLog
+++ b/Build/source/texk/texlive/linked_scripts/ChangeLog
@@ -1,3 +1,8 @@
+2015-04-20  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* Makefile.am (texmf_other_scripts): Add fmtutil-sys.sh and
+	updmap-sys.sh (maintained under Master).
+
 2015-04-12  Norbert Preining  <norbert@preining.info>
 
 	* Makefile.am (texmf_other_scripts): add fmtutil
diff --git a/Build/source/texk/texlive/linked_scripts/Makefile.am b/Build/source/texk/texlive/linked_scripts/Makefile.am
index b200d4b62ac..1f113ca8952 100644
--- a/Build/source/texk/texlive/linked_scripts/Makefile.am
+++ b/Build/source/texk/texlive/linked_scripts/Makefile.am
@@ -165,9 +165,11 @@ texmf_other_scripts = \
 	texdirflatten/texdirflatten \
 	texfot/texfot.pl \
 	texlive/fmtutil.pl \
+	texlive/fmtutil-sys.sh \
 	texlive/rungs.tlu \
 	texlive/tlmgr.pl \
 	texlive/updmap.pl \
+	texlive/updmap-sys.sh \
 	texliveonfly/texliveonfly.py \
 	texloganalyser/texloganalyser \
 	thumbpdf/thumbpdf.pl \
diff --git a/Build/source/texk/texlive/linked_scripts/Makefile.in b/Build/source/texk/texlive/linked_scripts/Makefile.in
index 9f7ca7d3aca..f6cb91019b1 100644
--- a/Build/source/texk/texlive/linked_scripts/Makefile.in
+++ b/Build/source/texk/texlive/linked_scripts/Makefile.in
@@ -383,9 +383,11 @@ texmf_other_scripts = \
 	texdirflatten/texdirflatten \
 	texfot/texfot.pl \
 	texlive/fmtutil.pl \
+	texlive/fmtutil-sys.sh \
 	texlive/rungs.tlu \
 	texlive/tlmgr.pl \
 	texlive/updmap.pl \
+	texlive/updmap-sys.sh \
 	texliveonfly/texliveonfly.py \
 	texloganalyser/texloganalyser \
 	thumbpdf/thumbpdf.pl \
diff --git a/Build/source/texk/texlive/linked_scripts/scripts.lst b/Build/source/texk/texlive/linked_scripts/scripts.lst
index 3a99476c34e..dc3749234e3 100644
--- a/Build/source/texk/texlive/linked_scripts/scripts.lst
+++ b/Build/source/texk/texlive/linked_scripts/scripts.lst
@@ -113,9 +113,11 @@ texdiff/texdiff
 texdirflatten/texdirflatten
 texfot/texfot.pl
 texlive/fmtutil.pl
+texlive/fmtutil-sys.sh
 texlive/rungs.tlu
 texlive/tlmgr.pl
 texlive/updmap.pl
+texlive/updmap-sys.sh
 texliveonfly/texliveonfly.py
 texloganalyser/texloganalyser
 thumbpdf/thumbpdf.pl
diff --git a/Build/source/texk/texlive/tl_scripts/fmtutil-sys.sh b/Build/source/texk/texlive/linked_scripts/texlive/fmtutil-sys.sh
index 11949ab7f46..11949ab7f46 100755
--- a/Build/source/texk/texlive/tl_scripts/fmtutil-sys.sh
+++ b/Build/source/texk/texlive/linked_scripts/texlive/fmtutil-sys.sh
diff --git a/Build/source/texk/texlive/tl_scripts/updmap-sys.sh b/Build/source/texk/texlive/linked_scripts/texlive/updmap-sys.sh
index 4bb9a4cd4af..4bb9a4cd4af 100755
--- a/Build/source/texk/texlive/tl_scripts/updmap-sys.sh
+++ b/Build/source/texk/texlive/linked_scripts/texlive/updmap-sys.sh
diff --git a/Build/source/texk/texlive/tl_scripts/ChangeLog b/Build/source/texk/texlive/tl_scripts/ChangeLog
index ed8011f1eb8..51c03ad9cd3 100644
--- a/Build/source/texk/texlive/tl_scripts/ChangeLog
+++ b/Build/source/texk/texlive/tl_scripts/ChangeLog
@@ -1,3 +1,8 @@
+2015-04-20  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* Makefile.am: Remove fmtutil-sys.sh and updmap-sys.sh, they are
+	maintained under Master and now handled via linked_scripts.
+
 2015-04-19  Karl Berry  <karl@tug.org>
 
 	* texlinks.sh (install_link): use $exeext for pdfcsplain too,
diff --git a/Build/source/texk/texlive/tl_scripts/Makefile.am b/Build/source/texk/texlive/tl_scripts/Makefile.am
index 6d2a927f5bf..7e508d34892 100644
--- a/Build/source/texk/texlive/tl_scripts/Makefile.am
+++ b/Build/source/texk/texlive/tl_scripts/Makefile.am
@@ -1,6 +1,6 @@
 ## Makefile.am for the TeX Live subdirectory texk/texlive/tl_scripts/
 ##
-## Copyright 2013-2014 Karl Berry <tex-live@tug.org>
+## Copyright 2013-2015 Karl Berry <tex-live@tug.org>
 ## You may freely use, modify and/or distribute this file.
 
 ## Build lists of scripts.
@@ -24,7 +24,6 @@ EXTRA_DIST = scripts.lst
 
 # These first variable definitions are what scripts_links.am requires.
 perl_scripts = e2pall
-shell_scripts = fmtutil-sys updmap-sys
 sh_scripts = \
 	allcm \
 	allneeded \
@@ -47,9 +46,9 @@ scriptsdir = texmf-dist/scripts/texlive
 include $(top_srcdir)/../../am/script_links.am
 #
 texmfdir = $(datarootdir)/$(scriptsdir)
-dist_texmf_SCRIPTS = $(perl_scripts:=.pl) $(shell_scripts:=.sh) $(sh_scripts:=.sh)
+dist_texmf_SCRIPTS = $(perl_scripts:=.pl) $(sh_scripts:=.sh)
 
-install-data-hook: install-bin-links install-man1-links install-perl-links install-shell-links install-sh-links
+install-data-hook: install-bin-links install-man1-links install-perl-links install-sh-links
 uninstall-hook: uninstall-bin-links uninstall-man1-links uninstall-links
 
 dist_man_MANS = \
@@ -141,6 +140,5 @@ $(DESTDIR)$(web2cdir)/fmtutil.cnf:
 ## 
 ## This target is invoked by check-wrapper-consistency (run from cron).
 .PHONY: echo-shell-scripts
-all_shell_scripts = $(shell_scripts) $(sh_scripts)
 echo-shell-scripts:
-	@echo $(all_shell_scripts)
+	@echo $(sh_scripts)
diff --git a/Build/source/texk/texlive/tl_scripts/Makefile.in b/Build/source/texk/texlive/tl_scripts/Makefile.in
index 96a22655cda..90d560390ba 100644
--- a/Build/source/texk/texlive/tl_scripts/Makefile.in
+++ b/Build/source/texk/texlive/tl_scripts/Makefile.in
@@ -257,7 +257,6 @@ EXTRA_DIST = scripts.lst $(top_builddir)/../../build-aux/relpath \
 
 # These first variable definitions are what scripts_links.am requires.
 perl_scripts = e2pall
-shell_scripts = fmtutil-sys updmap-sys
 sh_scripts = \
 	allcm \
 	allneeded \
@@ -283,7 +282,7 @@ all_scripts = $(lua_scripts) $(perl_scripts) $(shell_scripts)
 #
 #
 texmfdir = $(datarootdir)/$(scriptsdir)
-dist_texmf_SCRIPTS = $(perl_scripts:=.pl) $(shell_scripts:=.sh) $(sh_scripts:=.sh)
+dist_texmf_SCRIPTS = $(perl_scripts:=.pl) $(sh_scripts:=.sh)
 dist_man_MANS = \
   	allcm.1 \
 	allec.1 \
@@ -332,7 +331,6 @@ run_texlinks = $(texlinks_prog) -v \
 	-f $(DESTDIR)$(web2cdir)/fmtutil.cnf \
 	-e "$(EXEEXT)" $(DESTDIR)$(bindir)
 
-all_shell_scripts = $(shell_scripts) $(sh_scripts)
 all: all-am
 
 .SUFFIXES:
@@ -824,7 +822,7 @@ uninstall-links:
 @WIN32_FALSE@	  rm -f "$(DESTDIR)$(bindir)/$$f"; \
 @WIN32_FALSE@	done
 
-install-data-hook: install-bin-links install-man1-links install-perl-links install-shell-links install-sh-links
+install-data-hook: install-bin-links install-man1-links install-perl-links install-sh-links
 uninstall-hook: uninstall-bin-links uninstall-man1-links uninstall-links
 .PHONY: install-bin-links uninstall-bin-links
 
@@ -880,7 +878,7 @@ $(DESTDIR)$(web2cdir)/fmtutil.cnf:
 
 .PHONY: echo-shell-scripts
 echo-shell-scripts:
-	@echo $(all_shell_scripts)
+	@echo $(sh_scripts)
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/Build/source/texk/texlive/tl_scripts/scripts.lst b/Build/source/texk/texlive/tl_scripts/scripts.lst
index e925f313b03..190f0fd3e88 100644
--- a/Build/source/texk/texlive/tl_scripts/scripts.lst
+++ b/Build/source/texk/texlive/tl_scripts/scripts.lst
@@ -1,7 +1,5 @@
 tl_scripts='
 e2pall.pl
-fmtutil-sys.sh
-updmap-sys.sh
 allcm.sh
 allneeded.sh
 dvi2fax.sh