configure.ac:

CLISP_LIB can potentially end with a backslash (on mingw),
which is treated as a line merging character in Makefile,
so add _AM_SUBST_NOTMAKE(CLISP_LIB) to avoid such situation,
and instead refer to CLISP_LIB as @CLISP_LIB@

configure.ac, rte/Makefile.am, binaries/Makefile.am:

on mingw, lisp.run is called lisp.exe

on mingw, we need to use .exe suffix for the backend
binary (which is called xindy.run on POSIX systems), so to avoid
a clash with the frontend user command "xindy", use the
name "xindy-lisp.exe" on mingw which is a counterpart
of "xindy.run" on POSIX.

binaries/Makefile.am:

renamed XINDY_RUN to RUN_XINDY to not clash with the newly
introduced XINDY_RUN and LISP_RUN variables

added -norc to RUN_XINDY


git-svn-id: svn://tug.org/texlive/trunk@7336 c570f23f-e606-0410-a88d-b1316a301751

3 files changed, 25 insertions, 15 deletions

diff --git a/Build/source/utils/xindy/binaries/Makefile.am b/Build/source/utils/xindy/binaries/Makefile.am
index dcb7575a8e3..dd519c1a336 100644
--- a/Build/source/utils/xindy/binaries/Makefile.am
+++ b/Build/source/utils/xindy/binaries/Makefile.am
@@ -26,7 +26,7 @@ FAS        = base.fas locref.fas idxstyle.fas index.fas version.fas markup.fas
 DEFAULTS   = defaults.xdy
 DUMP_XINDY = $(SRCDIR)/dump-xindy.lsp
 MEMFILE    = xindy.mem
-XINDY_RUN  = ./xindy.run -q -M ./base.mem
+RUN_XINDY  = ./$(XINDY_RUN) -q -norc -M ./base.mem
 
 if TETEX_BUILD
     MODULEDIR = $(prefix)/texmf/xindy
@@ -38,13 +38,12 @@ else
     kerneldir = $(pkglibdir)
 endif
 
-xindy.mem: $(DEFAULTS) $(FAS) base.mem xindy.run
+xindy.mem: $(DEFAULTS) $(FAS) base.mem $(XINDY_RUN)
 	rm -f $(MEMFILE)
-	$(XINDY_RUN) -x '(load "$(DUMP_XINDY)")'
+	$(RUN_XINDY) -x '(load "$(DUMP_XINDY)")'
 	gzip $(MEMFILE)
 	mv $(MEMFILE).gz $(MEMFILE)
 
-
 $(DEFAULTS):
 	@$(RM) $(DEFAULTS)
 	@echo "Creating file $(DEFAULTS)..."
@@ -53,17 +52,16 @@ $(DEFAULTS):
 	@echo "  (pathname \"$(MODULEDIR)\")))"  >> $(DEFAULTS)
 	@echo "Finished $(DEFAULTS)."
 
-%.fas : $(SRCDIR)/%.lsp
-	$(XINDY_RUN) -c $< -o $@
+%.fas: $(SRCDIR)/%.lsp
+	$(RUN_XINDY) -c $< -o $@
 
 # *.lib files which should be cleaned
 FASLIBS = base.lib locref.lib idxstyle.lib index.lib version.lib markup.lib
 
 kernel_DATA = xindy.mem
 
-kernel_SCRIPTS = xindy.run
-
-CLEANFILES = $(FAS) $(FASLIBS) defaults.xdy base.mem \
-	$(kernel_DATA) $(kernel_SCRIPTS)
+kernel_SCRIPTS = $(XINDY_RUN)
 
+EXTRA_SCRIPTS = xindy.run xindy-lisp.exe
 
+CLEANFILES = $(FAS) $(FASLIBS) defaults.xdy base.mem xindy.mem $(XINDY_RUN)
diff --git a/Build/source/utils/xindy/configure.ac b/Build/source/utils/xindy/configure.ac
index 7789b96e0c1..d6700878921 100644
--- a/Build/source/utils/xindy/configure.ac
+++ b/Build/source/utils/xindy/configure.ac
@@ -93,6 +93,18 @@ via the --with-clisp=... option.])
 fi
 AC_SUBST(CLISP)
 AC_SUBST(CLISP_LIB)
+dnl CLISP_LIB may end with a backslash (on mingw)
+_AM_SUBST_NOTMAKE(CLISP_LIB)
+
+if test "x$EXEEXT" = "x.exe"; then
+  XINDY_RUN=xindy-lisp.exe
+  LISP_RUN=lisp.exe
+else
+  XINDY_RUN=xindy.run
+  LISP_RUN=lisp.run
+fi
+AC_SUBST(XINDY_RUN)
+AC_SUBST(LISP_RUN)
 
 # Checks for libraries.
 
diff --git a/Build/source/utils/xindy/rte/Makefile.am b/Build/source/utils/xindy/rte/Makefile.am
index 291efd036bb..9ef7e728f8a 100644
--- a/Build/source/utils/xindy/rte/Makefile.am
+++ b/Build/source/utils/xindy/rte/Makefile.am
@@ -27,15 +27,15 @@ EXTRA_DIST = NEWS README
 ORDRULES_FILES = ordrules.c ordrules.h rxsub.c rxsub.h mkind.h debug.h link.sh
 binariesdir = ../binaries
 
-all-local: $(binariesdir)/xindy.run $(binariesdir)/base.mem
+all-local: $(binariesdir)/$(XINDY_RUN) $(binariesdir)/base.mem
 
-$(binariesdir)/xindy.run $(binariesdir)/base.mem: 
+$(binariesdir)/$(XINDY_RUN) $(binariesdir)/base.mem:
 	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
-	env CLISP_LINKKIT="$(CLISP_LIB)/linkkit" \
-	sh "$(CLISP_LIB)/clisp-link" add-module-set ordrules "$(CLISP_LIB)/full" xindy-build-dir
-	cp xindy-build-dir/lisp.run $(binariesdir)/xindy.run
+	env CLISP_LINKKIT='@CLISP_LIB@/linkkit' \
+	sh '@CLISP_LIB@/clisp-link' add-module-set ordrules '@CLISP_LIB@/full' xindy-build-dir
+	cp xindy-build-dir/$(LISP_RUN) $(binariesdir)/$(XINDY_RUN)
 	cp xindy-build-dir/lispinit.mem $(binariesdir)/base.mem
 
 clean-local: