diff options
author | Vladimir Volovich <vvv@vsu.ru> | 2008-03-28 12:39:51 +0000 |
---|---|---|
committer | Vladimir Volovich <vvv@vsu.ru> | 2008-03-28 12:39:51 +0000 |
commit | 8ccfdb1bc36ca6dc3e3758ff6f79b1ed99b735f2 (patch) | |
tree | 234e559fef2ce6e7fef7388e72ac85b352567c32 /Build | |
parent | 7acf6eae3a8ac53fae6be03d4f05b85c7aac69d9 (diff) |
autoreconf
git-svn-id: svn://tug.org/texlive/trunk@7198 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
68 files changed, 122 insertions, 136 deletions
diff --git a/Build/source/utils/xindy/Makefile.in b/Build/source/utils/xindy/Makefile.in index 8cb9de71ff6..ea2a79cbefb 100644 --- a/Build/source/utils/xindy/Makefile.in +++ b/Build/source/utils/xindy/Makefile.in @@ -94,6 +94,7 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CLISP = @CLISP@ +CLISP_LIB = @CLISP_LIB@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ diff --git a/Build/source/utils/xindy/binaries/Makefile.in b/Build/source/utils/xindy/binaries/Makefile.in index f7ba25c5282..1125d8d48f4 100644 --- a/Build/source/utils/xindy/binaries/Makefile.in +++ b/Build/source/utils/xindy/binaries/Makefile.in @@ -67,6 +67,7 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CLISP = @CLISP@ +CLISP_LIB = @CLISP_LIB@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ diff --git a/Build/source/utils/xindy/configure b/Build/source/utils/xindy/configure index d534c11ae73..2717787123d 100755 --- a/Build/source/utils/xindy/configure +++ b/Build/source/utils/xindy/configure @@ -704,8 +704,7 @@ pdflatex BUILDDOCS_TRUE BUILDDOCS_FALSE CLISP -EXT_CLISP_TRUE -EXT_CLISP_FALSE +CLISP_LIB CPP GREP EGREP @@ -1315,13 +1314,13 @@ Optional Features: --enable-make-rules build and install make-rules package (default is YES) --enable-docs build and install documentation (default is YES) - --enable-tetex-build Build as part of a teTeX installation + --enable-tetex-build Build as part of a TeX Live installation Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) - --with-clisp[=PATH] Use the existing CLISP binary instead of re-building - CLISP from source in the rte/ directory + --with-clisp=... Use the specified location of the clisp executable + (default is search in PATH) Some influential environment variables: CC C compiler command @@ -1765,7 +1764,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -## make dist doesn't work yet, since configure makes CLISP. am__api_version='1.10' ac_aux_dir= @@ -3691,36 +3689,33 @@ if test "${enable_docs+set}" = set; then enableval=$enable_docs; fi - -# Building inside TeX Live? # Check whether --enable-tetex-build was given. if test "${enable_tetex_build+set}" = set; then enableval=$enable_tetex_build; fi -if test "x$enable_tetex_build" = xyes; then - if test ! -d $srcdir/../../texk/kpathsea; then - { { echo "$as_me:$LINENO: error: -========================================= - -You specified --enable-tetex-build, but I can't find the kpathsea -directory. I expected it to be in $srcdir/../../texk/kpathsea. - -=========================================" >&5 -echo "$as_me: error: -========================================= +# Check whether --with-clisp was given. +if test "${with_clisp+set}" = set; then + withval=$with_clisp; +fi -You specified --enable-tetex-build, but I can't find the kpathsea -directory. I expected it to be in $srcdir/../../texk/kpathsea. -=========================================" >&2;} - { (exit 1); exit 1; }; } - fi +if test "x$enable_tetex_build" = xyes; then + { echo "$as_me:$LINENO: Using installation layout for TeX Live" >&5 +echo "$as_me: Using installation layout for TeX Live" >&6;} docdir="$prefix/texmf/doc/$PACKAGE_NAME" mandir="$prefix/texmf/doc/man" - if test -z "$enable_docs"; then enable_docs=no; fi - if test -z "$enable_make_rules"; then enable_make_rules=no; fi + if test -z "$enable_docs"; then + { echo "$as_me:$LINENO: Disabling docs building" >&5 +echo "$as_me: Disabling docs building" >&6;} + enable_docs=no; + fi + if test -z "$enable_make_rules"; then + { echo "$as_me:$LINENO: Disabling make-rules building" >&5 +echo "$as_me: Disabling make-rules building" >&6;} + enable_make_rules=no; + fi fi if test "x$enable_tetex_build" = xyes; then TETEX_BUILD_TRUE= @@ -3861,13 +3856,6 @@ else fi - -# Check whether --with-clisp was given. -if test "${with_clisp+set}" = set; then - withval=$with_clisp; -fi - - CLISP= if test "x$with_clisp" = xyes; then # Extract the first word of "clisp", so it can be a program name with args. @@ -3910,20 +3898,10 @@ echo "${ECHO_T}no" >&6; } fi - if test -z "$CLISP"; then - { { echo "$as_me:$LINENO: error: --with-clisp specified, but clisp binary not found in PATH" >&5 -echo "$as_me: error: --with-clisp specified, but clisp binary not found in PATH" >&2;} - { (exit 1); exit 1; }; } - fi elif test "x$with_clisp" = xno; then - if test -d "$srcdir/rte/clisp-2.43"; then - { echo "$as_me:$LINENO: Using internal clisp" >&5 -echo "$as_me: Using internal clisp" >&6;} - else - { { echo "$as_me:$LINENO: error: --without-clisp specified, but clisp source directory not found at $srcdir/rte/clisp-2.43" >&5 -echo "$as_me: error: --without-clisp specified, but clisp source directory not found at $srcdir/rte/clisp-2.43" >&2;} + { { echo "$as_me:$LINENO: error: --without-clisp specified, but clisp is required" >&5 +echo "$as_me: error: --without-clisp specified, but clisp is required" >&2;} { (exit 1); exit 1; }; } - fi elif test -n "$with_clisp"; then CLISP="$with_clisp" else @@ -3967,47 +3945,38 @@ echo "${ECHO_T}no" >&6; } fi - if test -n "$CLISP"; then - : - elif test -d "$srcdir/rte/clisp-2.43"; then - { echo "$as_me:$LINENO: Using internal clisp" >&5 -echo "$as_me: Using internal clisp" >&6;} - else - { { echo "$as_me:$LINENO: error: clisp binary not found in PATH, nor the clisp source directory at $srcdir/rte/clisp-2.43" >&5 -echo "$as_me: error: clisp binary not found in PATH, nor the clisp source directory at $srcdir/rte/clisp-2.43" >&2;} - { (exit 1); exit 1; }; } - fi fi if test -n "$CLISP"; then - test -x "$CLISP" || { { echo "$as_me:$LINENO: error: clisp binary is not executable: $CLISP" >&5 -echo "$as_me: error: clisp binary is not executable: $CLISP" >&2;} + test -x "$CLISP" || { { echo "$as_me:$LINENO: error: clisp is not executable: $CLISP" >&5 +echo "$as_me: error: clisp is not executable: $CLISP" >&2;} { (exit 1); exit 1; }; } { echo "$as_me:$LINENO: checking for clisp library directory" >&5 echo $ECHO_N "checking for clisp library directory... $ECHO_C" >&6; } CLISP_LIB=`$CLISP -q -norc -x '(progn (princ *lib-directory*) (values))'` { echo "$as_me:$LINENO: result: $CLISP_LIB" >&5 echo "${ECHO_T}$CLISP_LIB" >&6; } - test -f "$CLISP_LIB/clisp-link" || { { echo "$as_me:$LINENO: error: expected file is not found: $CLISP_LIB/clisp-link" >&5 -echo "$as_me: error: expected file is not found: $CLISP_LIB/clisp-link" >&2;} + test -f "$CLISP_LIB/clisp-link" || { { echo "$as_me:$LINENO: error: clisp is not usable: expected file is not found: $CLISP_LIB/clisp-link" >&5 +echo "$as_me: error: clisp is not usable: expected file is not found: $CLISP_LIB/clisp-link" >&2;} { (exit 1); exit 1; }; } - test -d "$CLISP_LIB/full" || { { echo "$as_me:$LINENO: error: expected directory is not found: $CLISP_LIB/full" >&5 -echo "$as_me: error: expected directory is not found: $CLISP_LIB/full" >&2;} + test -d "$CLISP_LIB/full" || { { echo "$as_me:$LINENO: error: clisp is not usable: expected directory is not found: $CLISP_LIB/full" >&5 +echo "$as_me: error: clisp is not usable: expected directory is not found: $CLISP_LIB/full" >&2;} { (exit 1); exit 1; }; } - test -d "$CLISP_LIB/linkkit" || { { echo "$as_me:$LINENO: error: expected directory is not found: $CLISP_LIB/linkkit" >&5 -echo "$as_me: error: expected directory is not found: $CLISP_LIB/linkkit" >&2;} + test -d "$CLISP_LIB/linkkit" || { { echo "$as_me:$LINENO: error: clisp is not usable: expected directory is not found: $CLISP_LIB/linkkit" >&5 +echo "$as_me: error: clisp is not usable: expected directory is not found: $CLISP_LIB/linkkit" >&2;} { (exit 1); exit 1; }; } -fi - - if test -n "$CLISP"; then - EXT_CLISP_TRUE= - EXT_CLISP_FALSE='#' else - EXT_CLISP_TRUE='#' - EXT_CLISP_FALSE= + { { echo "$as_me:$LINENO: error: clisp is required but not found in PATH. +Please install clisp or specify the clisp executable location +via the --with-clisp=... option." >&5 +echo "$as_me: error: clisp is required but not found in PATH. +Please install clisp or specify the clisp executable location +via the --with-clisp=... option." >&2;} + { (exit 1); exit 1; }; } fi + # Checks for libraries. # Checks for header files. @@ -5150,13 +5119,6 @@ echo "$as_me: error: conditional \"BUILDDOCS\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi -if test -z "${EXT_CLISP_TRUE}" && test -z "${EXT_CLISP_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"EXT_CLISP\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"EXT_CLISP\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } -fi : ${CONFIG_STATUS=./config.status} ac_clean_files_save=$ac_clean_files @@ -5829,13 +5791,13 @@ pdflatex!$pdflatex$ac_delim BUILDDOCS_TRUE!$BUILDDOCS_TRUE$ac_delim BUILDDOCS_FALSE!$BUILDDOCS_FALSE$ac_delim CLISP!$CLISP$ac_delim -EXT_CLISP_TRUE!$EXT_CLISP_TRUE$ac_delim -EXT_CLISP_FALSE!$EXT_CLISP_FALSE$ac_delim +CLISP_LIB!$CLISP_LIB$ac_delim CPP!$CPP$ac_delim GREP!$GREP$ac_delim EGREP!$EGREP$ac_delim build!$build$ac_delim build_cpu!$build_cpu$ac_delim +build_vendor!$build_vendor$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -5877,7 +5839,6 @@ _ACEOF ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF -build_vendor!$build_vendor$ac_delim build_os!$build_os$ac_delim host!$host$ac_delim host_cpu!$host_cpu$ac_delim @@ -5887,7 +5848,7 @@ LIBOBJS!$LIBOBJS$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 8; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 7; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 diff --git a/Build/source/utils/xindy/doc/Makefile.in b/Build/source/utils/xindy/doc/Makefile.in index c58de4b5208..67fdb99a55a 100644 --- a/Build/source/utils/xindy/doc/Makefile.in +++ b/Build/source/utils/xindy/doc/Makefile.in @@ -77,6 +77,7 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CLISP = @CLISP@ +CLISP_LIB = @CLISP_LIB@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ diff --git a/Build/source/utils/xindy/doc/style-tutorial/Makefile.in b/Build/source/utils/xindy/doc/style-tutorial/Makefile.in index fc63acb3f71..eef8cd75a3e 100644 --- a/Build/source/utils/xindy/doc/style-tutorial/Makefile.in +++ b/Build/source/utils/xindy/doc/style-tutorial/Makefile.in @@ -64,6 +64,7 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CLISP = @CLISP@ +CLISP_LIB = @CLISP_LIB@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ diff --git a/Build/source/utils/xindy/make-rules/Makefile.in b/Build/source/utils/xindy/make-rules/Makefile.in index 25d2d284803..cd802faa713 100644 --- a/Build/source/utils/xindy/make-rules/Makefile.in +++ b/Build/source/utils/xindy/make-rules/Makefile.in @@ -66,6 +66,7 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CLISP = @CLISP@ +CLISP_LIB = @CLISP_LIB@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ diff --git a/Build/source/utils/xindy/make-rules/alphabets/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/Makefile.in index 5a5c33c86e9..9f05a7efb1a 100644 --- a/Build/source/utils/xindy/make-rules/alphabets/Makefile.in +++ b/Build/source/utils/xindy/make-rules/alphabets/Makefile.in @@ -164,6 +164,7 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CLISP = @CLISP@ +CLISP_LIB = @CLISP_LIB@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ diff --git a/Build/source/utils/xindy/make-rules/alphabets/albanian/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/albanian/Makefile.in index b0ee71b2eaa..a5d02e96b6d 100644 --- a/Build/source/utils/xindy/make-rules/alphabets/albanian/Makefile.in +++ b/Build/source/utils/xindy/make-rules/alphabets/albanian/Makefile.in @@ -54,6 +54,7 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CLISP = @CLISP@ +CLISP_LIB = @CLISP_LIB@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ diff --git a/Build/source/utils/xindy/make-rules/alphabets/belarusian/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/belarusian/Makefile.in index c88ca635dd4..63604221de1 100644 --- a/Build/source/utils/xindy/make-rules/alphabets/belarusian/Makefile.in +++ b/Build/source/utils/xindy/make-rules/alphabets/belarusian/Makefile.in @@ -54,6 +54,7 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CLISP = @CLISP@ +CLISP_LIB = @CLISP_LIB@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ diff --git a/Build/source/utils/xindy/make-rules/alphabets/bulgarian/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/bulgarian/Makefile.in index adee8996d8d..6f13960d09c 100644 --- a/Build/source/utils/xindy/make-rules/alphabets/bulgarian/Makefile.in +++ b/Build/source/utils/xindy/make-rules/alphabets/bulgarian/Makefile.in @@ -54,6 +54,7 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CLISP = @CLISP@ +CLISP_LIB = @CLISP_LIB@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ diff --git a/Build/source/utils/xindy/make-rules/alphabets/croatian/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/croatian/Makefile.in index 4e6f018a68d..0f056178e42 100644 --- a/Build/source/utils/xindy/make-rules/alphabets/croatian/Makefile.in +++ b/Build/source/utils/xindy/make-rules/alphabets/croatian/Makefile.in @@ -54,6 +54,7 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CLISP = @CLISP@ +CLISP_LIB = @CLISP_LIB@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ diff --git a/Build/source/utils/xindy/make-rules/alphabets/czech/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/czech/Makefile.in index b7645f4c030..2ec62eae733 100644 --- a/Build/source/utils/xindy/make-rules/alphabets/czech/Makefile.in +++ b/Build/source/utils/xindy/make-rules/alphabets/czech/Makefile.in @@ -54,6 +54,7 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CLISP = @CLISP@ +CLISP_LIB = @CLISP_LIB@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ diff --git a/Build/source/utils/xindy/make-rules/alphabets/danish/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/danish/Makefile.in index 47532d51e61..ef47cf28481 100644 --- a/Build/source/utils/xindy/make-rules/alphabets/danish/Makefile.in +++ b/Build/source/utils/xindy/make-rules/alphabets/danish/Makefile.in @@ -54,6 +54,7 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CLISP = @CLISP@ +CLISP_LIB = @CLISP_LIB@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ diff --git a/Build/source/utils/xindy/make-rules/alphabets/dutch/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/dutch/Makefile.in index 56bb392acd0..b9ad8baa710 100644 --- a/Build/source/utils/xindy/make-rules/alphabets/dutch/Makefile.in +++ b/Build/source/utils/xindy/make-rules/alphabets/dutch/Makefile.in @@ -54,6 +54,7 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CLISP = @CLISP@ +CLISP_LIB = @CLISP_LIB@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ diff --git a/Build/source/utils/xindy/make-rules/alphabets/english/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/english/Makefile.in index b0c5c777c28..aa29ec37a12 100644 --- a/Build/source/utils/xindy/make-rules/alphabets/english/Makefile.in +++ b/Build/source/utils/xindy/make-rules/alphabets/english/Makefile.in @@ -54,6 +54,7 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CLISP = @CLISP@ +CLISP_LIB = @CLISP_LIB@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ diff --git a/Build/source/utils/xindy/make-rules/alphabets/esperanto/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/esperanto/Makefile.in index 4f4efeb6327..f82bebf9af0 100644 --- a/Build/source/utils/xindy/make-rules/alphabets/esperanto/Makefile.in +++ b/Build/source/utils/xindy/make-rules/alphabets/esperanto/Makefile.in @@ -54,6 +54,7 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CLISP = @CLISP@ +CLISP_LIB = @CLISP_LIB@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ diff --git a/Build/source/utils/xindy/make-rules/alphabets/estonian/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/estonian/Makefile.in index 645807960c9..c9d209fe5cc 100644 --- a/Build/source/utils/xindy/make-rules/alphabets/estonian/Makefile.in +++ b/Build/source/utils/xindy/make-rules/alphabets/estonian/Makefile.in @@ -54,6 +54,7 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CLISP = @CLISP@ +CLISP_LIB = @CLISP_LIB@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ diff --git a/Build/source/utils/xindy/make-rules/alphabets/finnish/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/finnish/Makefile.in index 51a5e313352..053aa2bf38a 100644 --- a/Build/source/utils/xindy/make-rules/alphabets/finnish/Makefile.in +++ b/Build/source/utils/xindy/make-rules/alphabets/finnish/Makefile.in @@ -54,6 +54,7 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CLISP = @CLISP@ +CLISP_LIB = @CLISP_LIB@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ diff --git a/Build/source/utils/xindy/make-rules/alphabets/french/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/french/Makefile.in index c7d2e35d849..2d15a9c9e23 100644 --- a/Build/source/utils/xindy/make-rules/alphabets/french/Makefile.in +++ b/Build/source/utils/xindy/make-rules/alphabets/french/Makefile.in @@ -54,6 +54,7 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CLISP = @CLISP@ +CLISP_LIB = @CLISP_LIB@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ diff --git a/Build/source/utils/xindy/make-rules/alphabets/general/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/general/Makefile.in index 6e5486e4088..500bf34df99 100644 --- a/Build/source/utils/xindy/make-rules/alphabets/general/Makefile.in +++ b/Build/source/utils/xindy/make-rules/alphabets/general/Makefile.in @@ -54,6 +54,7 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CLISP = @CLISP@ +CLISP_LIB = @CLISP_LIB@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ diff --git a/Build/source/utils/xindy/make-rules/alphabets/georgian/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/georgian/Makefile.in index c68bfbfb613..53981d8e60b 100644 --- a/Build/source/utils/xindy/make-rules/alphabets/georgian/Makefile.in +++ b/Build/source/utils/xindy/make-rules/alphabets/georgian/Makefile.in @@ -54,6 +54,7 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CLISP = @CLISP@ +CLISP_LIB = @CLISP_LIB@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ diff --git a/Build/source/utils/xindy/make-rules/alphabets/german/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/german/Makefile.in index 978a31dcd3e..d0d4ad934eb 100644 --- a/Build/source/utils/xindy/make-rules/alphabets/german/Makefile.in +++ b/Build/source/utils/xindy/make-rules/alphabets/german/Makefile.in @@ -54,6 +54,7 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CLISP = @CLISP@ +CLISP_LIB = @CLISP_LIB@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ diff --git a/Build/source/utils/xindy/make-rules/alphabets/greek/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/greek/Makefile.in index d7dce3cb0e1..5cba304480d 100644 --- a/Build/source/utils/xindy/make-rules/alphabets/greek/Makefile.in +++ b/Build/source/utils/xindy/make-rules/alphabets/greek/Makefile.in @@ -54,6 +54,7 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CLISP = @CLISP@ +CLISP_LIB = @CLISP_LIB@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ diff --git a/Build/source/utils/xindy/make-rules/alphabets/gypsy/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/gypsy/Makefile.in index be79cd32431..1eedf5e71ae 100644 --- a/Build/source/utils/xindy/make-rules/alphabets/gypsy/Makefile.in +++ b/Build/source/utils/xindy/make-rules/alphabets/gypsy/Makefile.in @@ -54,6 +54,7 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CLISP = @CLISP@ +CLISP_LIB = @CLISP_LIB@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ diff --git a/Build/source/utils/xindy/make-rules/alphabets/hausa/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/hausa/Makefile.in index caa9793b45c..2c1b380b7db 100644 --- a/Build/source/utils/xindy/make-rules/alphabets/hausa/Makefile.in +++ b/Build/source/utils/xindy/make-rules/alphabets/hausa/Makefile.in @@ -54,6 +54,7 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CLISP = @CLISP@ +CLISP_LIB = @CLISP_LIB@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ diff --git a/Build/source/utils/xindy/make-rules/alphabets/hebrew/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/hebrew/Makefile.in index 49d528c9e32..8b5c619dbc7 100644 --- a/Build/source/utils/xindy/make-rules/alphabets/hebrew/Makefile.in +++ b/Build/source/utils/xindy/make-rules/alphabets/hebrew/Makefile.in @@ -54,6 +54,7 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CLISP = @CLISP@ +CLISP_LIB = @CLISP_LIB@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ diff --git a/Build/source/utils/xindy/make-rules/alphabets/hungarian/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/hungarian/Makefile.in index 23218bd274b..500cf9de361 100644 --- a/Build/source/utils/xindy/make-rules/alphabets/hungarian/Makefile.in +++ b/Build/source/utils/xindy/make-rules/alphabets/hungarian/Makefile.in @@ -54,6 +54,7 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CLISP = @CLISP@ +CLISP_LIB = @CLISP_LIB@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ diff --git a/Build/source/utils/xindy/make-rules/alphabets/icelandic/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/icelandic/Makefile.in index de7ab259ff4..4663e6dfedf 100644 --- a/Build/source/utils/xindy/make-rules/alphabets/icelandic/Makefile.in +++ b/Build/source/utils/xindy/make-rules/alphabets/icelandic/Makefile.in @@ -54,6 +54,7 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CLISP = @CLISP@ +CLISP_LIB = @CLISP_LIB@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ diff --git a/Build/source/utils/xindy/make-rules/alphabets/italian/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/italian/Makefile.in index 02fe4a33c26..afddb885fd3 100644 --- a/Build/source/utils/xindy/make-rules/alphabets/italian/Makefile.in +++ b/Build/source/utils/xindy/make-rules/alphabets/italian/Makefile.in @@ -54,6 +54,7 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CLISP = @CLISP@ +CLISP_LIB = @CLISP_LIB@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ diff --git a/Build/source/utils/xindy/make-rules/alphabets/klingon/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/klingon/Makefile.in index 133d6376926..09dde69d8b2 100644 --- a/Build/source/utils/xindy/make-rules/alphabets/klingon/Makefile.in +++ b/Build/source/utils/xindy/make-rules/alphabets/klingon/Makefile.in @@ -54,6 +54,7 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CLISP = @CLISP@ +CLISP_LIB = @CLISP_LIB@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ diff --git a/Build/source/utils/xindy/make-rules/alphabets/kurdish/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/kurdish/Makefile.in index 9fc618f4ca1..e3af7e80969 100644 --- a/Build/source/utils/xindy/make-rules/alphabets/kurdish/Makefile.in +++ b/Build/source/utils/xindy/make-rules/alphabets/kurdish/Makefile.in @@ -54,6 +54,7 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CLISP = @CLISP@ +CLISP_LIB = @CLISP_LIB@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ diff --git a/Build/source/utils/xindy/make-rules/alphabets/latin/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/latin/Makefile.in index e93c60dc354..f9e7aa4e9ca 100644 --- a/Build/source/utils/xindy/make-rules/alphabets/latin/Makefile.in +++ b/Build/source/utils/xindy/make-rules/alphabets/latin/Makefile.in @@ -54,6 +54,7 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CLISP = @CLISP@ +CLISP_LIB = @CLISP_LIB@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ diff --git a/Build/source/utils/xindy/make-rules/alphabets/latvian/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/latvian/Makefile.in index b6e9cabd4b3..79222c9a28a 100644 --- a/Build/source/utils/xindy/make-rules/alphabets/latvian/Makefile.in +++ b/Build/source/utils/xindy/make-rules/alphabets/latvian/Makefile.in @@ -54,6 +54,7 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CLISP = @CLISP@ +CLISP_LIB = @CLISP_LIB@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ diff --git a/Build/source/utils/xindy/make-rules/alphabets/lithuanian/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/lithuanian/Makefile.in index bb55a259268..27aa29a4fb9 100644 --- a/Build/source/utils/xindy/make-rules/alphabets/lithuanian/Makefile.in +++ b/Build/source/utils/xindy/make-rules/alphabets/lithuanian/Makefile.in @@ -54,6 +54,7 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CLISP = @CLISP@ +CLISP_LIB = @CLISP_LIB@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ diff --git a/Build/source/utils/xindy/make-rules/alphabets/lower-sorbian/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/lower-sorbian/Makefile.in index abbdc97a2ff..9e5707449a2 100644 --- a/Build/source/utils/xindy/make-rules/alphabets/lower-sorbian/Makefile.in +++ b/Build/source/utils/xindy/make-rules/alphabets/lower-sorbian/Makefile.in @@ -54,6 +54,7 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CLISP = @CLISP@ +CLISP_LIB = @CLISP_LIB@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ diff --git a/Build/source/utils/xindy/make-rules/alphabets/macedonian/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/macedonian/Makefile.in index 2331da6492a..bfa3b005bbb 100644 --- a/Build/source/utils/xindy/make-rules/alphabets/macedonian/Makefile.in +++ b/Build/source/utils/xindy/make-rules/alphabets/macedonian/Makefile.in @@ -54,6 +54,7 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CLISP = @CLISP@ +CLISP_LIB = @CLISP_LIB@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ diff --git a/Build/source/utils/xindy/make-rules/alphabets/mongolian/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/mongolian/Makefile.in index 40908e8f984..b95c0258c6a 100644 --- a/Build/source/utils/xindy/make-rules/alphabets/mongolian/Makefile.in +++ b/Build/source/utils/xindy/make-rules/alphabets/mongolian/Makefile.in @@ -54,6 +54,7 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CLISP = @CLISP@ +CLISP_LIB = @CLISP_LIB@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ diff --git a/Build/source/utils/xindy/make-rules/alphabets/norwegian/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/norwegian/Makefile.in index c827202133b..3135523a657 100644 --- a/Build/source/utils/xindy/make-rules/alphabets/norwegian/Makefile.in +++ b/Build/source/utils/xindy/make-rules/alphabets/norwegian/Makefile.in @@ -54,6 +54,7 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CLISP = @CLISP@ +CLISP_LIB = @CLISP_LIB@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ diff --git a/Build/source/utils/xindy/make-rules/alphabets/polish/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/polish/Makefile.in index 748424795cb..b28f3e66783 100644 --- a/Build/source/utils/xindy/make-rules/alphabets/polish/Makefile.in +++ b/Build/source/utils/xindy/make-rules/alphabets/polish/Makefile.in @@ -54,6 +54,7 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CLISP = @CLISP@ +CLISP_LIB = @CLISP_LIB@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ diff --git a/Build/source/utils/xindy/make-rules/alphabets/portuguese/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/portuguese/Makefile.in index 483cbf9180a..27dea344f4a 100644 --- a/Build/source/utils/xindy/make-rules/alphabets/portuguese/Makefile.in +++ b/Build/source/utils/xindy/make-rules/alphabets/portuguese/Makefile.in @@ -54,6 +54,7 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CLISP = @CLISP@ +CLISP_LIB = @CLISP_LIB@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ diff --git a/Build/source/utils/xindy/make-rules/alphabets/romanian/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/romanian/Makefile.in index b6a59bbb42b..99b55e4dd5f 100644 --- a/Build/source/utils/xindy/make-rules/alphabets/romanian/Makefile.in +++ b/Build/source/utils/xindy/make-rules/alphabets/romanian/Makefile.in @@ -54,6 +54,7 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CLISP = @CLISP@ +CLISP_LIB = @CLISP_LIB@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ diff --git a/Build/source/utils/xindy/make-rules/alphabets/russian/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/russian/Makefile.in index 6282286a064..f178235257c 100644 --- a/Build/source/utils/xindy/make-rules/alphabets/russian/Makefile.in +++ b/Build/source/utils/xindy/make-rules/alphabets/russian/Makefile.in @@ -54,6 +54,7 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CLISP = @CLISP@ +CLISP_LIB = @CLISP_LIB@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ diff --git a/Build/source/utils/xindy/make-rules/alphabets/serbian/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/serbian/Makefile.in index 6768a7b133d..a0218676181 100644 --- a/Build/source/utils/xindy/make-rules/alphabets/serbian/Makefile.in +++ b/Build/source/utils/xindy/make-rules/alphabets/serbian/Makefile.in @@ -54,6 +54,7 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CLISP = @CLISP@ +CLISP_LIB = @CLISP_LIB@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ diff --git a/Build/source/utils/xindy/make-rules/alphabets/slovak/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/slovak/Makefile.in index 186e1cf7200..3fbc4f341a6 100644 --- a/Build/source/utils/xindy/make-rules/alphabets/slovak/Makefile.in +++ b/Build/source/utils/xindy/make-rules/alphabets/slovak/Makefile.in @@ -54,6 +54,7 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CLISP = @CLISP@ +CLISP_LIB = @CLISP_LIB@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ diff --git a/Build/source/utils/xindy/make-rules/alphabets/slovenian/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/slovenian/Makefile.in index d26122fce08..88131e2bc9c 100644 --- a/Build/source/utils/xindy/make-rules/alphabets/slovenian/Makefile.in +++ b/Build/source/utils/xindy/make-rules/alphabets/slovenian/Makefile.in @@ -54,6 +54,7 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CLISP = @CLISP@ +CLISP_LIB = @CLISP_LIB@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ diff --git a/Build/source/utils/xindy/make-rules/alphabets/spanish/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/spanish/Makefile.in index 6b1ae9a8d53..8fcdaa4a3fe 100644 --- a/Build/source/utils/xindy/make-rules/alphabets/spanish/Makefile.in +++ b/Build/source/utils/xindy/make-rules/alphabets/spanish/Makefile.in @@ -54,6 +54,7 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CLISP = @CLISP@ +CLISP_LIB = @CLISP_LIB@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ diff --git a/Build/source/utils/xindy/make-rules/alphabets/swedish/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/swedish/Makefile.in index c80fb9a5b55..42e686925a4 100644 --- a/Build/source/utils/xindy/make-rules/alphabets/swedish/Makefile.in +++ b/Build/source/utils/xindy/make-rules/alphabets/swedish/Makefile.in @@ -54,6 +54,7 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CLISP = @CLISP@ +CLISP_LIB = @CLISP_LIB@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ diff --git a/Build/source/utils/xindy/make-rules/alphabets/test1/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/test1/Makefile.in index f27ccdae912..41b57d52406 100644 --- a/Build/source/utils/xindy/make-rules/alphabets/test1/Makefile.in +++ b/Build/source/utils/xindy/make-rules/alphabets/test1/Makefile.in @@ -54,6 +54,7 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CLISP = @CLISP@ +CLISP_LIB = @CLISP_LIB@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ diff --git a/Build/source/utils/xindy/make-rules/alphabets/turkish/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/turkish/Makefile.in index 7fa20cfec97..098e7854520 100644 --- a/Build/source/utils/xindy/make-rules/alphabets/turkish/Makefile.in +++ b/Build/source/utils/xindy/make-rules/alphabets/turkish/Makefile.in @@ -54,6 +54,7 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CLISP = @CLISP@ +CLISP_LIB = @CLISP_LIB@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ diff --git a/Build/source/utils/xindy/make-rules/alphabets/ukrainian/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/ukrainian/Makefile.in index 2a4bcc6659a..df26a90f42c 100644 --- a/Build/source/utils/xindy/make-rules/alphabets/ukrainian/Makefile.in +++ b/Build/source/utils/xindy/make-rules/alphabets/ukrainian/Makefile.in @@ -54,6 +54,7 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CLISP = @CLISP@ +CLISP_LIB = @CLISP_LIB@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ diff --git a/Build/source/utils/xindy/make-rules/alphabets/upper-sorbian/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/upper-sorbian/Makefile.in index ba62497f0e7..26fda5c1e9a 100644 --- a/Build/source/utils/xindy/make-rules/alphabets/upper-sorbian/Makefile.in +++ b/Build/source/utils/xindy/make-rules/alphabets/upper-sorbian/Makefile.in @@ -54,6 +54,7 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CLISP = @CLISP@ +CLISP_LIB = @CLISP_LIB@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ diff --git a/Build/source/utils/xindy/make-rules/alphabets/vietnamese/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/vietnamese/Makefile.in index 80daa640bf5..d40da36f599 100644 --- a/Build/source/utils/xindy/make-rules/alphabets/vietnamese/Makefile.in +++ b/Build/source/utils/xindy/make-rules/alphabets/vietnamese/Makefile.in @@ -54,6 +54,7 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CLISP = @CLISP@ +CLISP_LIB = @CLISP_LIB@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ diff --git a/Build/source/utils/xindy/make-rules/inputenc/Makefile.in b/Build/source/utils/xindy/make-rules/inputenc/Makefile.in index eea9786e89d..db1dd8371a1 100644 --- a/Build/source/utils/xindy/make-rules/inputenc/Makefile.in +++ b/Build/source/utils/xindy/make-rules/inputenc/Makefile.in @@ -64,6 +64,7 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CLISP = @CLISP@ +CLISP_LIB = @CLISP_LIB@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ diff --git a/Build/source/utils/xindy/make-rules/styles/Makefile.in b/Build/source/utils/xindy/make-rules/styles/Makefile.in index 28a03a030b1..af8d91750ac 100644 --- a/Build/source/utils/xindy/make-rules/styles/Makefile.in +++ b/Build/source/utils/xindy/make-rules/styles/Makefile.in @@ -64,6 +64,7 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CLISP = @CLISP@ +CLISP_LIB = @CLISP_LIB@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ diff --git a/Build/source/utils/xindy/modules/Makefile.in b/Build/source/utils/xindy/modules/Makefile.in index 30abfead182..1dfa13ee549 100644 --- a/Build/source/utils/xindy/modules/Makefile.in +++ b/Build/source/utils/xindy/modules/Makefile.in @@ -66,6 +66,7 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CLISP = @CLISP@ +CLISP_LIB = @CLISP_LIB@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ diff --git a/Build/source/utils/xindy/modules/base/Makefile.in b/Build/source/utils/xindy/modules/base/Makefile.in index f23f1a5c635..5bc517166ec 100644 --- a/Build/source/utils/xindy/modules/base/Makefile.in +++ b/Build/source/utils/xindy/modules/base/Makefile.in @@ -64,6 +64,7 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CLISP = @CLISP@ +CLISP_LIB = @CLISP_LIB@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ diff --git a/Build/source/utils/xindy/modules/class/Makefile.in b/Build/source/utils/xindy/modules/class/Makefile.in index 9ff557dba18..074c81a47d5 100644 --- a/Build/source/utils/xindy/modules/class/Makefile.in +++ b/Build/source/utils/xindy/modules/class/Makefile.in @@ -64,6 +64,7 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CLISP = @CLISP@ +CLISP_LIB = @CLISP_LIB@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ diff --git a/Build/source/utils/xindy/modules/lang/Makefile.in b/Build/source/utils/xindy/modules/lang/Makefile.in index aa7411cae70..68c0f976502 100644 --- a/Build/source/utils/xindy/modules/lang/Makefile.in +++ b/Build/source/utils/xindy/modules/lang/Makefile.in @@ -66,6 +66,7 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CLISP = @CLISP@ +CLISP_LIB = @CLISP_LIB@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ diff --git a/Build/source/utils/xindy/modules/lang/german/Makefile.in b/Build/source/utils/xindy/modules/lang/german/Makefile.in index 63a861ae7f2..c780ec912bf 100644 --- a/Build/source/utils/xindy/modules/lang/german/Makefile.in +++ b/Build/source/utils/xindy/modules/lang/german/Makefile.in @@ -64,6 +64,7 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CLISP = @CLISP@ +CLISP_LIB = @CLISP_LIB@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ diff --git a/Build/source/utils/xindy/modules/lang/latin/Makefile.in b/Build/source/utils/xindy/modules/lang/latin/Makefile.in index 3ee3bd41c5f..7ece3b69dfe 100644 --- a/Build/source/utils/xindy/modules/lang/latin/Makefile.in +++ b/Build/source/utils/xindy/modules/lang/latin/Makefile.in @@ -64,6 +64,7 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CLISP = @CLISP@ +CLISP_LIB = @CLISP_LIB@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ diff --git a/Build/source/utils/xindy/modules/ord/Makefile.in b/Build/source/utils/xindy/modules/ord/Makefile.in index 5a1dd3ee44a..673cc05c5b6 100644 --- a/Build/source/utils/xindy/modules/ord/Makefile.in +++ b/Build/source/utils/xindy/modules/ord/Makefile.in @@ -64,6 +64,7 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CLISP = @CLISP@ +CLISP_LIB = @CLISP_LIB@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ diff --git a/Build/source/utils/xindy/modules/rules/Makefile.in b/Build/source/utils/xindy/modules/rules/Makefile.in index 52739399d94..d23d4f9738d 100644 --- a/Build/source/utils/xindy/modules/rules/Makefile.in +++ b/Build/source/utils/xindy/modules/rules/Makefile.in @@ -64,6 +64,7 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CLISP = @CLISP@ +CLISP_LIB = @CLISP_LIB@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ diff --git a/Build/source/utils/xindy/modules/styles/Makefile.in b/Build/source/utils/xindy/modules/styles/Makefile.in index 5c55b09cba5..9c25156d539 100644 --- a/Build/source/utils/xindy/modules/styles/Makefile.in +++ b/Build/source/utils/xindy/modules/styles/Makefile.in @@ -64,6 +64,7 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CLISP = @CLISP@ +CLISP_LIB = @CLISP_LIB@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ diff --git a/Build/source/utils/xindy/rte/Makefile.in b/Build/source/utils/xindy/rte/Makefile.in index 5e99aec5ec3..e9c6fd1f6ec 100644 --- a/Build/source/utils/xindy/rte/Makefile.in +++ b/Build/source/utils/xindy/rte/Makefile.in @@ -66,6 +66,7 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CLISP = @CLISP@ +CLISP_LIB = @CLISP_LIB@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -155,18 +156,7 @@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -clisp_src = clisp-2.43 -clisp_builddir = $(shell pwd)/clisp-build-dir -@EXT_CLISP_FALSE@CLISP_LIB = $(clisp_builddir) -@EXT_CLISP_TRUE@CLISP_LIB = $(shell $(CLISP) -q -norc -x '(progn (princ *lib-directory*) (values))') -@EXT_CLISP_FALSE@CLISP_PREREQ = $(clisp_link) $(fulldir) -@EXT_CLISP_TRUE@CLISP_PREREQ = -fulldir = $(CLISP_LIB)/full -clisp_link = $(CLISP_LIB)/clisp-link binariesdir = ../binaries - -#clisp_modules=--with-export-syscalls --with-dynamic-ffi --ignore-absence-of-libsigsegv -clisp_modules := --with-dynamic-ffi --ignore-absence-of-libsigsegv ORDRULES_FILES = ordrules.c ordrules.h rxsub.c rxsub.h mkind.h debug.h link.sh SUBDIRS = ordrules EXTRA_DIST = NEWS README @@ -405,15 +395,13 @@ distclean-generic: maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." -@EXT_CLISP_TRUE@distclean-local: clean: clean-recursive clean-am: clean-generic clean-local mostlyclean-am distclean: distclean-recursive -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-local \ - distclean-tags +distclean-am: clean-am distclean-generic distclean-tags dvi: dvi-recursive @@ -467,61 +455,32 @@ uninstall-am: .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ all all-am all-local check check-am clean clean-generic \ clean-local ctags ctags-recursive distclean distclean-generic \ - distclean-local distclean-tags distdir dvi dvi-am html html-am \ - info info-am install install-am install-data install-data-am \ - install-dvi install-dvi-am install-exec install-exec-am \ - install-html install-html-am install-info install-info-am \ - install-man install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ - pdf-am ps ps-am tags tags-recursive uninstall uninstall-am - -@EXT_CLISP_TRUE@ export CLISP = @CLISP@ -@EXT_CLISP_FALSE@ export CLISP = $(clisp_builddir)/clisp + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + installdirs-am maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic pdf pdf-am ps ps-am tags \ + tags-recursive uninstall uninstall-am -export CLISP_LINKKIT = $(CLISP_LIB)/linkkit -# testing for MacOS X platform to circumvent faulty 'readline' -# provided by Maarten Sneep <maarten.sneep@xs4all.nl> -# FIXME: GNU make ifeq/endif clauses do not work in Automake files. -# Either determine that case during configure or make them work. -#ifeq ($(shell uname -s), Darwin) -# clisp_modules += --without-readline -#endif +export CLISP_LINKKIT = $(CLISP_LIB)/linkkit all-local: xindy-build-dir -@EXT_CLISP_FALSE@$(clisp_builddir): $(clisp_src) -@EXT_CLISP_FALSE@ cd $(clisp_src) && ./configure $(clisp_builddir) $(clisp_modules) -@EXT_CLISP_FALSE@ cd $(clisp_builddir) && ./makemake $(clisp_modules) > Makefile - -@EXT_CLISP_FALSE@$(CLISP_PREREQ): $(clisp_builddir) -@EXT_CLISP_FALSE@ $(MAKE) -C $(clisp_builddir) - -# Target names that are easy to type, to build CLISP alone during development. -@EXT_CLISP_FALSE@clisp-configure: $(clisp_builddir) -@EXT_CLISP_FALSE@clisp: $(CLISP_PREREQ) - -@EXT_CLISP_FALSE@check: -@EXT_CLISP_FALSE@ $(MAKE) -C $(clisp_builddir) check || $(MAKE) -C $(clisp_builddir) check - -xindy-build-dir: $(CLISP_PREREQ) +xindy-build-dir: rm -rf xindy-build-dir test -f ordrules/link.sh || for i in $(ORDRULES_FILES); do cp -p $(top_srcdir)/rte/ordrules/$$i ordrules/$$i; done $(MAKE) -C ordrules ordrulei.c - sh $(clisp_link) add-module-set ordrules $(fulldir) $@ + sh $(CLISP_LIB)/clisp-link add-module-set ordrules $(CLISP_LIB)/full $@ cp $@/lisp.run $(binariesdir)/xindy.run cp $@/lispinit.mem $(binariesdir)/base.mem clean-local: rm -rf xindy-build-dir test "$(builddir)" = "$(srcdir)" || for i in $(ORDRULES_FILES); do rm -f ordrules/$$i; done -@EXT_CLISP_FALSE@ if [ -e $(clisp_builddir) ]; then $(MAKE) -C $(clisp_builddir) clean; fi - -# remove some extra files to match pristine clisp source -@EXT_CLISP_FALSE@distclean-local: clean -@EXT_CLISP_FALSE@ rm -rf $(clisp_builddir) # 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. .NOEXPORT: diff --git a/Build/source/utils/xindy/rte/ordrules/Makefile.in b/Build/source/utils/xindy/rte/ordrules/Makefile.in index a6b695a7064..d7cc5143cdc 100644 --- a/Build/source/utils/xindy/rte/ordrules/Makefile.in +++ b/Build/source/utils/xindy/rte/ordrules/Makefile.in @@ -57,6 +57,7 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CLISP = @CLISP@ +CLISP_LIB = @CLISP_LIB@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ diff --git a/Build/source/utils/xindy/src/Makefile.in b/Build/source/utils/xindy/src/Makefile.in index 6cb14908959..f972bf69296 100644 --- a/Build/source/utils/xindy/src/Makefile.in +++ b/Build/source/utils/xindy/src/Makefile.in @@ -56,6 +56,7 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CLISP = @CLISP@ +CLISP_LIB = @CLISP_LIB@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ diff --git a/Build/source/utils/xindy/tex2xindy/Makefile.in b/Build/source/utils/xindy/tex2xindy/Makefile.in index 554faffc37d..97f1105def3 100644 --- a/Build/source/utils/xindy/tex2xindy/Makefile.in +++ b/Build/source/utils/xindy/tex2xindy/Makefile.in @@ -77,6 +77,7 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CLISP = @CLISP@ +CLISP_LIB = @CLISP_LIB@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ diff --git a/Build/source/utils/xindy/user-commands/Makefile.in b/Build/source/utils/xindy/user-commands/Makefile.in index c51a48d517d..1656c435cb7 100644 --- a/Build/source/utils/xindy/user-commands/Makefile.in +++ b/Build/source/utils/xindy/user-commands/Makefile.in @@ -65,6 +65,7 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CLISP = @CLISP@ +CLISP_LIB = @CLISP_LIB@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ |