summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorVladimir Volovich <vvv@vsu.ru>2008-03-26 14:38:10 +0000
committerVladimir Volovich <vvv@vsu.ru>2008-03-26 14:38:10 +0000
commitf8b208eeea6a39734ba5d318ee3400b7f2c2a577 (patch)
tree94e72a37120ed20f3ab7c8b33e8d1083cadf0c80 /Build
parentf1284e6810faf814861702268b6c6df6f62f9725 (diff)
renamed xindy.v2.in to xindy.v2, and change #!/usr/bin/perl to #!/usr/bin/env perl
(the only change which was being made to xindy.v2.in to get xindy.v2 was perl path) changed user-commands/Makefile.am to not install xindy.v2 (from Joachim) removed kludge from xindy to call xindy.v2 if an old calling convention is used git-svn-id: svn://tug.org/texlive/trunk@7164 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r--Build/source/utils/xindy/user-commands/Makefile.am15
-rw-r--r--Build/source/utils/xindy/user-commands/Makefile.in18
-rw-r--r--Build/source/utils/xindy/user-commands/xindy.in7
-rw-r--r--Build/source/utils/xindy/user-commands/xindy.v2 (renamed from Build/source/utils/xindy/user-commands/xindy.v2.in)2
4 files changed, 14 insertions, 28 deletions
diff --git a/Build/source/utils/xindy/user-commands/Makefile.am b/Build/source/utils/xindy/user-commands/Makefile.am
index 9281440c245..da64795efb3 100644
--- a/Build/source/utils/xindy/user-commands/Makefile.am
+++ b/Build/source/utils/xindy/user-commands/Makefile.am
@@ -21,33 +21,30 @@
## Boston, MA 02110-1301 USA.
if TETEX_BUILD
-install-exec-hook: xindy xindy.v2
+install-exec-hook: xindy
$(MKDIR_P) "$(prefix)/texmf/scripts/xindy"
- -rm -f $(bindir)/xindy $(bindir)/xindy.v2 $(bindir)/texindy
+ -rm -f $(bindir)/xindy $(bindir)/texindy
$(INSTALL_SCRIPT) xindy $(prefix)/texmf/scripts/xindy/xindy.pl
ln -s ../../texmf/scripts/xindy/xindy.pl $(bindir)/xindy
-# $(INSTALL_SCRIPT) xindy.v2 $(prefix)/texmf/scripts/xindy/xindy.v2.pl
-# ln -s ../../texmf/scripts/xindy/xindy.v2.pl $(bindir)/xindy.v2
$(INSTALL_SCRIPT) $(srcdir)/texindy $(prefix)/texmf/scripts/xindy/texindy.pl
ln -s ../../texmf/scripts/xindy/texindy.pl $(bindir)/texindy
else
- bin_SCRIPTS = xindy xindy.v2
+ bin_SCRIPTS = xindy
dist_bin_SCRIPTS = texindy
endif
xindy: xindy.in
sed -e 's:@libdir\@:$(libdir):' $(srcdir)/xindy.in >xindy
-xindy.v2: xindy.v2.in
- sed -e 's:@XINDY_PERL\@:/usr/bin/env perl:' $(srcdir)/xindy.v2.in >xindy.v2
-
man_MANS = texindy.1 xindy.1
+dist_noinst_SCRIPTS = xindy.v2 makeindex4
+
dist_noinst_MANS = xindy.v2.1 makeindex4.1
EXTRA_DIST = $(man_MANS)
-CLEANFILES = xindy xindy.v2
+CLEANFILES = xindy
if MAINTAINER_MODE
POD_DATE = `ident $< | grep '\$$Id' | sed -e 's/^.*,v [^ ]* //' -e 's/ .*//' -e s:/:-:g`
diff --git a/Build/source/utils/xindy/user-commands/Makefile.in b/Build/source/utils/xindy/user-commands/Makefile.in
index 13b8ae50843..ff42feef9ab 100644
--- a/Build/source/utils/xindy/user-commands/Makefile.in
+++ b/Build/source/utils/xindy/user-commands/Makefile.in
@@ -34,7 +34,7 @@ build_triplet = @build@
host_triplet = @host@
subdir = user-commands
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
- $(am__dist_bin_SCRIPTS_DIST)
+ $(am__dist_bin_SCRIPTS_DIST) $(dist_noinst_SCRIPTS)
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/ac_prog_latex.m4 \
$(top_srcdir)/m4/ac_prog_pdflatex.m4 \
@@ -48,7 +48,7 @@ am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" \
binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
am__dist_bin_SCRIPTS_DIST = texindy
dist_binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
-SCRIPTS = $(bin_SCRIPTS) $(dist_bin_SCRIPTS)
+SCRIPTS = $(bin_SCRIPTS) $(dist_bin_SCRIPTS) $(dist_noinst_SCRIPTS)
SOURCES =
man1dir = $(mandir)/man1
NROFF = nroff
@@ -152,12 +152,13 @@ sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-@TETEX_BUILD_FALSE@bin_SCRIPTS = xindy xindy.v2
+@TETEX_BUILD_FALSE@bin_SCRIPTS = xindy
@TETEX_BUILD_FALSE@dist_bin_SCRIPTS = texindy
man_MANS = texindy.1 xindy.1
+dist_noinst_SCRIPTS = xindy.v2 makeindex4
dist_noinst_MANS = xindy.v2.1 makeindex4.1
EXTRA_DIST = $(man_MANS)
-CLEANFILES = xindy xindy.v2
+CLEANFILES = xindy
@MAINTAINER_MODE_TRUE@POD_DATE = `ident $< | grep '\$$Id' | sed -e 's/^.*,v [^ ]* //' -e 's/ .*//' -e s:/:-:g`
@MAINTAINER_MODE_TRUE@POD_VERSION = `ident $< | grep '\$$Id' | sed -e 's/^.*,v //' -e 's/ .*//'`
@MAINTAINER_MODE_TRUE@POD_NAME = `basename $@ .1 | tr '[a-z]' '[A-Z]'`
@@ -391,22 +392,17 @@ uninstall-man: uninstall-man1
uninstall-man uninstall-man1
-@TETEX_BUILD_TRUE@install-exec-hook: xindy xindy.v2
+@TETEX_BUILD_TRUE@install-exec-hook: xindy
@TETEX_BUILD_TRUE@ $(MKDIR_P) "$(prefix)/texmf/scripts/xindy"
-@TETEX_BUILD_TRUE@ -rm -f $(bindir)/xindy $(bindir)/xindy.v2 $(bindir)/texindy
+@TETEX_BUILD_TRUE@ -rm -f $(bindir)/xindy $(bindir)/texindy
@TETEX_BUILD_TRUE@ $(INSTALL_SCRIPT) xindy $(prefix)/texmf/scripts/xindy/xindy.pl
@TETEX_BUILD_TRUE@ ln -s ../../texmf/scripts/xindy/xindy.pl $(bindir)/xindy
-# $(INSTALL_SCRIPT) xindy.v2 $(prefix)/texmf/scripts/xindy/xindy.v2.pl
-# ln -s ../../texmf/scripts/xindy/xindy.v2.pl $(bindir)/xindy.v2
@TETEX_BUILD_TRUE@ $(INSTALL_SCRIPT) $(srcdir)/texindy $(prefix)/texmf/scripts/xindy/texindy.pl
@TETEX_BUILD_TRUE@ ln -s ../../texmf/scripts/xindy/texindy.pl $(bindir)/texindy
xindy: xindy.in
sed -e 's:@libdir\@:$(libdir):' $(srcdir)/xindy.in >xindy
-xindy.v2: xindy.v2.in
- sed -e 's:@XINDY_PERL\@:/usr/bin/env perl:' $(srcdir)/xindy.v2.in >xindy.v2
-
@MAINTAINER_MODE_TRUE@$(srcdir)/xindy.1: $(srcdir)/xindy.in
@MAINTAINER_MODE_TRUE@ $(POD2MAN) --center '$(PACKAGE_NAME)' \
@MAINTAINER_MODE_TRUE@ --name="$(POD_NAME)" \
diff --git a/Build/source/utils/xindy/user-commands/xindy.in b/Build/source/utils/xindy/user-commands/xindy.in
index 7d63cb93f0d..db629369457 100644
--- a/Build/source/utils/xindy/user-commands/xindy.in
+++ b/Build/source/utils/xindy/user-commands/xindy.in
@@ -376,15 +376,8 @@ our ($quiet, $verbose, %debug,
$input_markup = 'latex';
$mem_file = "$lib_dir/xindy.mem";
-my @orig_argv = @ARGV;
parse_options();
-if ( @ARGV == 2 ) {
- if ( $ARGV[0] =~ /\.xdy$/ ) {
- exec "$cmd_dir/xindy.v2", @orig_argv;
- }
-}
-
# This script creates temporary files. Whenever a file is created, its
# name is added to @temp_files. In an END handler, the temporary files
diff --git a/Build/source/utils/xindy/user-commands/xindy.v2.in b/Build/source/utils/xindy/user-commands/xindy.v2
index 2fe99a8cb9f..4da4297dccc 100644
--- a/Build/source/utils/xindy/user-commands/xindy.v2.in
+++ b/Build/source/utils/xindy/user-commands/xindy.v2
@@ -1,4 +1,4 @@
-#!@XINDY_PERL@
+#!/usr/bin/env perl
# $Id: xindy.in,v 1.14 2005/05/02 19:16:27 jschrod Exp $
#------------------------------------------------------------
#