summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2012-07-28 09:54:24 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2012-07-28 09:54:24 +0000
commit0696868cdd6ddc367c14e173c8faf92f03166c12 (patch)
treec91497b214cf097523c16fc37162f33ebcb25fbb /Build
parentcce4fc6a08227c41e7da8c093bf528b9bf043854 (diff)
build system: linked scripts: No WIN32 wrapper script replacement for shell script symlinks
git-svn-id: svn://tug.org/texlive/trunk@27213 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r--Build/source/texk/texlive/linked_scripts/ChangeLog4
-rw-r--r--Build/source/texk/texlive/linked_scripts/Makefile.am5
-rw-r--r--Build/source/texk/texlive/linked_scripts/Makefile.in9
-rw-r--r--Build/source/texk/texlive/linked_scripts/scripts.lst1
4 files changed, 13 insertions, 6 deletions
diff --git a/Build/source/texk/texlive/linked_scripts/ChangeLog b/Build/source/texk/texlive/linked_scripts/ChangeLog
index 36c6a882dc3..8bf42e3f964 100644
--- a/Build/source/texk/texlive/linked_scripts/ChangeLog
+++ b/Build/source/texk/texlive/linked_scripts/ChangeLog
@@ -1,3 +1,7 @@
+2012-07-28 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am (bin_links) [WIN32]: Skip shell script links.
+
2011-12-08 Peter Breitenlohner <peb@mppmu.mpg.de>
* Makefile.am: Rename the target scripts.tmp into scripts-list
diff --git a/Build/source/texk/texlive/linked_scripts/Makefile.am b/Build/source/texk/texlive/linked_scripts/Makefile.am
index 45036cd9c1d..93abf1ef758 100644
--- a/Build/source/texk/texlive/linked_scripts/Makefile.am
+++ b/Build/source/texk/texlive/linked_scripts/Makefile.am
@@ -144,8 +144,11 @@ nobase_dist_texmf_dist_scripts_SCRIPTS = \
# Symlinks within $(bindir): FILE:LINK indicates LINK->FILE
bin_links = \
epstopdf:repstopdf \
- lua2dox_lua:lua2dox_filter \
pdfcrop:rpdfcrop
+if !WIN32
+bin_links += \
+ lua2dox_lua:lua2dox_filter
+endif !WIN32
# The idea is to install the scripts themselves in texmf*/scripts, and
# have bin/arch/foo be a symlink to, say,
diff --git a/Build/source/texk/texlive/linked_scripts/Makefile.in b/Build/source/texk/texlive/linked_scripts/Makefile.in
index d12841fc02e..30d2c2633af 100644
--- a/Build/source/texk/texlive/linked_scripts/Makefile.in
+++ b/Build/source/texk/texlive/linked_scripts/Makefile.in
@@ -48,6 +48,9 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
+@WIN32_FALSE@am__append_1 = \
+@WIN32_FALSE@ lua2dox_lua:lua2dox_filter
+
subdir = linked_scripts
DIST_COMMON = README $(nobase_dist_texmf_dist_scripts_SCRIPTS) \
$(nobase_dist_texmf_scripts_SCRIPTS) $(srcdir)/Makefile.am \
@@ -325,11 +328,7 @@ nobase_dist_texmf_dist_scripts_SCRIPTS = \
# Symlinks within $(bindir): FILE:LINK indicates LINK->FILE
-bin_links = \
- epstopdf:repstopdf \
- lua2dox_lua:lua2dox_filter \
- pdfcrop:rpdfcrop
-
+bin_links = epstopdf:repstopdf pdfcrop:rpdfcrop $(am__append_1)
relpath = $(SHELL) $(top_srcdir)/../../build-aux/relpath
runscript = $(top_srcdir)/w32_wrapper/runscript.exe
@WIN32_TRUE@WINEXT = $(EXEEXT)
diff --git a/Build/source/texk/texlive/linked_scripts/scripts.lst b/Build/source/texk/texlive/linked_scripts/scripts.lst
index 66757d6eb80..976a410a4ce 100644
--- a/Build/source/texk/texlive/linked_scripts/scripts.lst
+++ b/Build/source/texk/texlive/linked_scripts/scripts.lst
@@ -13,6 +13,7 @@ installfont/installfont-tl
latexfileversion/latexfileversion
listbib/listbib
listings-ext/listings-ext.sh
+lua2dox/lua2dox_lua
pdfjam/pdf180
pdfjam/pdf270
pdfjam/pdf90