From 2df1a0de2950ebd5697b994c1bbf7c655ac271c9 Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Wed, 19 May 2010 08:30:39 +0000 Subject: xindy build git-svn-id: svn://tug.org/texlive/trunk@18348 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/utils/xindy/ChangeLog | 4 ++++ Build/source/utils/xindy/configure | 4 +++- Build/source/utils/xindy/configure.ac | 4 +++- 3 files changed, 10 insertions(+), 2 deletions(-) (limited to 'Build') diff --git a/Build/source/utils/xindy/ChangeLog b/Build/source/utils/xindy/ChangeLog index 32c80f26996..681f759993c 100644 --- a/Build/source/utils/xindy/ChangeLog +++ b/Build/source/utils/xindy/ChangeLog @@ -1,3 +1,7 @@ +2010-05-19 Peter Breitenlohner + + * configure.ac (LISP_RUN): Convert dos line endings from cygwin. + 2010-05-18 Peter Breitenlohner * configure.ac (LISP_RUN): Better solution, from Joachim Schrod. diff --git a/Build/source/utils/xindy/configure b/Build/source/utils/xindy/configure index 551b635c435..bb53c80b781 100755 --- a/Build/source/utils/xindy/configure +++ b/Build/source/utils/xindy/configure @@ -3980,7 +3980,9 @@ if test "x$with_clisp_runtime" != xsystem; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for clisp runtime" >&5 $as_echo_n "checking for clisp runtime... " >&6; } if test "x$with_clisp_runtime" = xdefault; then - LISP_RUN=`echo '(format t "~a" *lib-directory*)' | $CLISP -q -norc -`base/$LISP_RUN + # Convert dos line endings from cygwin clisp. + LISP_RUN=`echo '(format t "~a" *lib-directory*)' \ + | $CLISP -q -norc - | tr -d '\r'`base/$LISP_RUN else LISP_RUN=$with_clisp_runtime fi diff --git a/Build/source/utils/xindy/configure.ac b/Build/source/utils/xindy/configure.ac index 463866bb946..958ebc9e3e2 100644 --- a/Build/source/utils/xindy/configure.ac +++ b/Build/source/utils/xindy/configure.ac @@ -83,7 +83,9 @@ fi if test "x$with_clisp_runtime" != xsystem; then AC_MSG_CHECKING([for clisp runtime]) if test "x$with_clisp_runtime" = xdefault; then - LISP_RUN=`echo '(format t "~a" *lib-directory*)' | $CLISP -q -norc -`base/$LISP_RUN + # Convert dos line endings from cygwin clisp. + LISP_RUN=`echo '(format t "~a" *lib-directory*)' \ + | $CLISP -q -norc - | tr -d '\r'`base/$LISP_RUN else LISP_RUN=$with_clisp_runtime fi -- cgit v1.2.3