From 52a47279995f68192602db79594d7dcd91c0185b Mon Sep 17 00:00:00 2001 From: Vladimir Volovich Date: Tue, 25 Mar 2008 10:01:29 +0000 Subject: for TETEX_BUILD: from Karl: instead of putting wrapper scripts (xindy and texindy) and *.xdy modules under texmf/scripts/xindy, adjust things so that the actual scripts (xindy and texindy) are in texmf/scripts/xindy, but everything else (*.xdy modules) is just in texmf/xindy. git-svn-id: svn://tug.org/texlive/trunk@7144 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/utils/xindy/binaries/Makefile.am | 2 +- Build/source/utils/xindy/make-rules/alphabets/Makefile.am | 2 +- Build/source/utils/xindy/make-rules/inputenc/Makefile.am | 2 +- Build/source/utils/xindy/make-rules/styles/Makefile.am | 2 +- Build/source/utils/xindy/modules/base/Makefile.am | 2 +- Build/source/utils/xindy/modules/class/Makefile.am | 2 +- Build/source/utils/xindy/modules/lang/german/Makefile.am | 2 +- Build/source/utils/xindy/modules/lang/latin/Makefile.am | 2 +- Build/source/utils/xindy/modules/ord/Makefile.am | 2 +- Build/source/utils/xindy/modules/rules/Makefile.am | 2 +- Build/source/utils/xindy/modules/styles/Makefile.am | 2 +- Build/source/utils/xindy/user-commands/xindy.in | 4 ++-- Build/source/utils/xindy/user-commands/xindy.v2.in | 4 ++-- 13 files changed, 15 insertions(+), 15 deletions(-) (limited to 'Build') diff --git a/Build/source/utils/xindy/binaries/Makefile.am b/Build/source/utils/xindy/binaries/Makefile.am index be5396ce9c6..dcb7575a8e3 100644 --- a/Build/source/utils/xindy/binaries/Makefile.am +++ b/Build/source/utils/xindy/binaries/Makefile.am @@ -29,7 +29,7 @@ MEMFILE = xindy.mem XINDY_RUN = ./xindy.run -q -M ./base.mem if TETEX_BUILD - MODULEDIR = $(prefix)/texmf/scripts/xindy + MODULEDIR = $(prefix)/texmf/xindy kerneldir = $(bindir) else # Where the modules are found at runtime. diff --git a/Build/source/utils/xindy/make-rules/alphabets/Makefile.am b/Build/source/utils/xindy/make-rules/alphabets/Makefile.am index f7766bc1628..580bd5548de 100644 --- a/Build/source/utils/xindy/make-rules/alphabets/Makefile.am +++ b/Build/source/utils/xindy/make-rules/alphabets/Makefile.am @@ -20,7 +20,7 @@ ## Boston, MA 02110-1301 USA. if TETEX_BUILD - langdir = $(prefix)/texmf/scripts/xindy/lang + langdir = $(prefix)/texmf/xindy/lang else langdir = $(pkgdatadir)/lang endif diff --git a/Build/source/utils/xindy/make-rules/inputenc/Makefile.am b/Build/source/utils/xindy/make-rules/inputenc/Makefile.am index b4081c65e60..1bd3097b2e7 100644 --- a/Build/source/utils/xindy/make-rules/inputenc/Makefile.am +++ b/Build/source/utils/xindy/make-rules/inputenc/Makefile.am @@ -20,7 +20,7 @@ ## Boston, MA 02110-1301 USA. if TETEX_BUILD - modulesdir = $(prefix)/texmf/scripts/xindy + modulesdir = $(prefix)/texmf/xindy else modulesdir = $(pkgdatadir) endif diff --git a/Build/source/utils/xindy/make-rules/styles/Makefile.am b/Build/source/utils/xindy/make-rules/styles/Makefile.am index 7108d5c0ae3..22a085d124e 100644 --- a/Build/source/utils/xindy/make-rules/styles/Makefile.am +++ b/Build/source/utils/xindy/make-rules/styles/Makefile.am @@ -20,7 +20,7 @@ ## Boston, MA 02110-1301 USA. if TETEX_BUILD - modulesdir = $(prefix)/texmf/scripts/xindy + modulesdir = $(prefix)/texmf/xindy else modulesdir = $(pkgdatadir) endif diff --git a/Build/source/utils/xindy/modules/base/Makefile.am b/Build/source/utils/xindy/modules/base/Makefile.am index e5666bb0ec6..2d5a7df3637 100644 --- a/Build/source/utils/xindy/modules/base/Makefile.am +++ b/Build/source/utils/xindy/modules/base/Makefile.am @@ -20,7 +20,7 @@ ## Boston, MA 02110-1301 USA. if TETEX_BUILD - modulesdir = $(prefix)/texmf/scripts/xindy + modulesdir = $(prefix)/texmf/xindy else modulesdir = $(pkgdatadir) endif diff --git a/Build/source/utils/xindy/modules/class/Makefile.am b/Build/source/utils/xindy/modules/class/Makefile.am index c34f9b156b6..4d7f765598f 100644 --- a/Build/source/utils/xindy/modules/class/Makefile.am +++ b/Build/source/utils/xindy/modules/class/Makefile.am @@ -20,7 +20,7 @@ ## Boston, MA 02110-1301 USA. if TETEX_BUILD - modulesdir = $(prefix)/texmf/scripts/xindy + modulesdir = $(prefix)/texmf/xindy else modulesdir = $(pkgdatadir) endif diff --git a/Build/source/utils/xindy/modules/lang/german/Makefile.am b/Build/source/utils/xindy/modules/lang/german/Makefile.am index ff4ed1a3ab8..112bd08545f 100644 --- a/Build/source/utils/xindy/modules/lang/german/Makefile.am +++ b/Build/source/utils/xindy/modules/lang/german/Makefile.am @@ -20,7 +20,7 @@ ## Boston, MA 02110-1301 USA. if TETEX_BUILD - langdir = $(prefix)/texmf/scripts/xindy/lang + langdir = $(prefix)/texmf/xindy/lang else langdir = $(pkgdatadir)/lang endif diff --git a/Build/source/utils/xindy/modules/lang/latin/Makefile.am b/Build/source/utils/xindy/modules/lang/latin/Makefile.am index 6b6aa79212d..7224166f855 100644 --- a/Build/source/utils/xindy/modules/lang/latin/Makefile.am +++ b/Build/source/utils/xindy/modules/lang/latin/Makefile.am @@ -20,7 +20,7 @@ ## Boston, MA 02110-1301 USA. if TETEX_BUILD - langdir = $(prefix)/texmf/scripts/xindy/lang + langdir = $(prefix)/texmf/xindy/lang else langdir = $(pkgdatadir)/lang endif diff --git a/Build/source/utils/xindy/modules/ord/Makefile.am b/Build/source/utils/xindy/modules/ord/Makefile.am index a8cea6e30ee..17dc444cfae 100644 --- a/Build/source/utils/xindy/modules/ord/Makefile.am +++ b/Build/source/utils/xindy/modules/ord/Makefile.am @@ -20,7 +20,7 @@ ## Boston, MA 02110-1301 USA. if TETEX_BUILD - modulesdir = $(prefix)/texmf/scripts/xindy + modulesdir = $(prefix)/texmf/xindy else modulesdir = $(pkgdatadir) endif diff --git a/Build/source/utils/xindy/modules/rules/Makefile.am b/Build/source/utils/xindy/modules/rules/Makefile.am index c71fb4953fd..b420ad007d4 100644 --- a/Build/source/utils/xindy/modules/rules/Makefile.am +++ b/Build/source/utils/xindy/modules/rules/Makefile.am @@ -20,7 +20,7 @@ ## Boston, MA 02110-1301 USA. if TETEX_BUILD - modulesdir = $(prefix)/texmf/scripts/xindy + modulesdir = $(prefix)/texmf/xindy else modulesdir = $(pkgdatadir) endif diff --git a/Build/source/utils/xindy/modules/styles/Makefile.am b/Build/source/utils/xindy/modules/styles/Makefile.am index 611804f3b08..15729535571 100644 --- a/Build/source/utils/xindy/modules/styles/Makefile.am +++ b/Build/source/utils/xindy/modules/styles/Makefile.am @@ -20,7 +20,7 @@ ## Boston, MA 02110-1301 USA. if TETEX_BUILD - modulesdir = $(prefix)/texmf/scripts/xindy + modulesdir = $(prefix)/texmf/xindy else modulesdir = $(pkgdatadir) endif diff --git a/Build/source/utils/xindy/user-commands/xindy.in b/Build/source/utils/xindy/user-commands/xindy.in index 95c51bad479..361559c2c94 100644 --- a/Build/source/utils/xindy/user-commands/xindy.in +++ b/Build/source/utils/xindy/user-commands/xindy.in @@ -315,8 +315,8 @@ BEGIN { $modules_dir = "$cmd_dir/../modules"; } elsif ( -d "$lib_dir/modules" ) { # /usr style $modules_dir = "$lib_dir/modules"; - } elsif ( -d "$lib_dir/../../texmf/scripts/xindy" ) { # texlive style - $modules_dir = "$lib_dir/../../texmf/scripts/xindy"; + } elsif ( -d "$lib_dir/../../texmf/xindy" ) { # texlive style + $modules_dir = "$lib_dir/../../texmf/xindy"; } elsif ( -d "/usr/share/xindy" ) { # FSH style $modules_dir = "/usr/share/xindy"; } else { diff --git a/Build/source/utils/xindy/user-commands/xindy.v2.in b/Build/source/utils/xindy/user-commands/xindy.v2.in index 67a14e6cf25..2fe99a8cb9f 100644 --- a/Build/source/utils/xindy/user-commands/xindy.v2.in +++ b/Build/source/utils/xindy/user-commands/xindy.v2.in @@ -160,8 +160,8 @@ if ( -d "$cmd_dir/../modules" ) { # /opt style $modules_dir = "$cmd_dir/../modules"; } elsif ( -d "$LibDir/modules" ) { # /usr or /usr/local style $modules_dir = "$LibDir/modules"; -} elsif ( -d "$LibDir/../../texmf/scripts/xindy" ) { # texlive style - $modules_dir = "$LibDir/../../texmf/scripts/xindy"; +} elsif ( -d "$LibDir/../../texmf/xindy" ) { # texlive style + $modules_dir = "$LibDir/../../texmf/xindy"; } else { die "Cannot locate xindy modules directory"; } -- cgit v1.2.3