diff options
| author | Vladimir Volovich <vvv@vsu.ru> | 2008-03-22 04:30:47 +0000 |
|---|---|---|
| committer | Vladimir Volovich <vvv@vsu.ru> | 2008-03-22 04:30:47 +0000 |
| commit | faaf22ece56389786d45ae6463600986eaead3a9 (patch) | |
| tree | 34f14306bdff66b91d7de7b8caea0e9e0d77b690 /Build/source/utils/xindy/modules | |
| parent | 1472f655976291d22dbaa4c321df214ae82d9ec3 (diff) | |
* instead of 3 configure options: --enable-external-clisp,
--enable-clisp-path, --enable-clisp-dir there is now only one:
--with-external-clisp[=PATH] which, when used, asks to use an
external clisp, which is searched in $PATH, or it is possible
to supply an absolute location if it is not in $PATH.
* the former --enable-clisp-dir option is removed; instead, we use
a robust way to determine CLISP library directory by calling
clisp -q -norc -x '(progn (princ *lib-directory*) (values))'
(this is borrowed from the Meta-CVS package, referenced at
http://www.niksula.cs.hut.fi/~tsiivola/clisp-ffi-howto.html)
* the configure script performs better checking of clisp
availability and shows proper errors when needed.
* added the --enable-tetex-build option which is used for the
texlive builds, and installs the files at the texlive-specific
locations. added corresponding support to the user-commands
scripts (xindy, xindy.v2, texindy), to allow them locate
xindy.{run,mem} and runtime *.xdy modules in the texlive layout.
* do not fail if clisp-link shell script exists but is not
executable, as it happens in some distributions. instead, call
it via "sh".
git-svn-id: svn://tug.org/texlive/trunk@7067 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/utils/xindy/modules')
7 files changed, 35 insertions, 7 deletions
diff --git a/Build/source/utils/xindy/modules/base/Makefile.am b/Build/source/utils/xindy/modules/base/Makefile.am index 42220d6ab42..e5666bb0ec6 100644 --- a/Build/source/utils/xindy/modules/base/Makefile.am +++ b/Build/source/utils/xindy/modules/base/Makefile.am @@ -19,7 +19,11 @@ ## Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ## Boston, MA 02110-1301 USA. -modulesdir = $(pkgdatadir) +if TETEX_BUILD + modulesdir = $(prefix)/texmf/scripts/xindy +else + modulesdir = $(pkgdatadir) +endif basedir = $(modulesdir)/base diff --git a/Build/source/utils/xindy/modules/class/Makefile.am b/Build/source/utils/xindy/modules/class/Makefile.am index a83d7f9d02b..c34f9b156b6 100644 --- a/Build/source/utils/xindy/modules/class/Makefile.am +++ b/Build/source/utils/xindy/modules/class/Makefile.am @@ -19,7 +19,11 @@ ## Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ## Boston, MA 02110-1301 USA. -modulesdir = $(pkgdatadir) +if TETEX_BUILD + modulesdir = $(prefix)/texmf/scripts/xindy +else + modulesdir = $(pkgdatadir) +endif classdir = $(modulesdir)/class diff --git a/Build/source/utils/xindy/modules/lang/german/Makefile.am b/Build/source/utils/xindy/modules/lang/german/Makefile.am index 534bb1ccbac..ff4ed1a3ab8 100644 --- a/Build/source/utils/xindy/modules/lang/german/Makefile.am +++ b/Build/source/utils/xindy/modules/lang/german/Makefile.am @@ -19,7 +19,11 @@ ## Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ## Boston, MA 02110-1301 USA. -langdir = $(pkgdatadir)/lang +if TETEX_BUILD + langdir = $(prefix)/texmf/scripts/xindy/lang +else + langdir = $(pkgdatadir)/lang +endif germandir = $(langdir)/german diff --git a/Build/source/utils/xindy/modules/lang/latin/Makefile.am b/Build/source/utils/xindy/modules/lang/latin/Makefile.am index fa4a5d9fe91..6b6aa79212d 100644 --- a/Build/source/utils/xindy/modules/lang/latin/Makefile.am +++ b/Build/source/utils/xindy/modules/lang/latin/Makefile.am @@ -19,7 +19,11 @@ ## Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ## Boston, MA 02110-1301 USA. -langdir = $(pkgdatadir)/lang +if TETEX_BUILD + langdir = $(prefix)/texmf/scripts/xindy/lang +else + langdir = $(pkgdatadir)/lang +endif latindir = $(langdir)/latin diff --git a/Build/source/utils/xindy/modules/ord/Makefile.am b/Build/source/utils/xindy/modules/ord/Makefile.am index 47138a6a333..a8cea6e30ee 100644 --- a/Build/source/utils/xindy/modules/ord/Makefile.am +++ b/Build/source/utils/xindy/modules/ord/Makefile.am @@ -19,7 +19,11 @@ ## Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ## Boston, MA 02110-1301 USA. -modulesdir = $(pkgdatadir) +if TETEX_BUILD + modulesdir = $(prefix)/texmf/scripts/xindy +else + modulesdir = $(pkgdatadir) +endif orddir = $(modulesdir)/ord diff --git a/Build/source/utils/xindy/modules/rules/Makefile.am b/Build/source/utils/xindy/modules/rules/Makefile.am index 98bf7a7fd29..c71fb4953fd 100644 --- a/Build/source/utils/xindy/modules/rules/Makefile.am +++ b/Build/source/utils/xindy/modules/rules/Makefile.am @@ -19,7 +19,11 @@ ## Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ## Boston, MA 02110-1301 USA. -modulesdir = $(pkgdatadir) +if TETEX_BUILD + modulesdir = $(prefix)/texmf/scripts/xindy +else + modulesdir = $(pkgdatadir) +endif rulesdir = $(modulesdir)/rules diff --git a/Build/source/utils/xindy/modules/styles/Makefile.am b/Build/source/utils/xindy/modules/styles/Makefile.am index 9c9d06302d9..611804f3b08 100644 --- a/Build/source/utils/xindy/modules/styles/Makefile.am +++ b/Build/source/utils/xindy/modules/styles/Makefile.am @@ -19,7 +19,11 @@ ## Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ## Boston, MA 02110-1301 USA. -modulesdir = $(pkgdatadir) +if TETEX_BUILD + modulesdir = $(prefix)/texmf/scripts/xindy +else + modulesdir = $(pkgdatadir) +endif texdir = $(modulesdir)/styles |