summaryrefslogtreecommitdiff
path: root/Build/source
diff options
context:
space:
mode:
authorVladimir Volovich <vvv@vsu.ru>2008-03-20 05:15:22 +0000
committerVladimir Volovich <vvv@vsu.ru>2008-03-20 05:15:22 +0000
commit5930eec86e1831ca9842291fb407cb42e23b52ae (patch)
tree9d1ed3c6c03a540feda35d9f64faf68edbcf543c /Build/source
parent85040eb45f81b3b817c56ff70419bba1f3f1055b (diff)
add support for building xindy from outside of the source tree, for the standard TL build to work
git-svn-id: svn://tug.org/texlive/trunk@7034 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source')
-rw-r--r--Build/source/utils/xindy/binaries/Makefile.am2
-rw-r--r--Build/source/utils/xindy/make-rules/alphabets/Makefile.am24
-rwxr-xr-xBuild/source/utils/xindy/make-rules/alphabets/make-rules.pl3
-rw-r--r--Build/source/utils/xindy/make-rules/inputenc/Makefile.am4
-rw-r--r--Build/source/utils/xindy/rte/Makefile.am3
-rw-r--r--Build/source/utils/xindy/rte/ordrules/Makefile.in6
-rw-r--r--Build/source/utils/xindy/user-commands/Makefile.am8
7 files changed, 28 insertions, 22 deletions
diff --git a/Build/source/utils/xindy/binaries/Makefile.am b/Build/source/utils/xindy/binaries/Makefile.am
index bf2e9c489da..ebc00f3b851 100644
--- a/Build/source/utils/xindy/binaries/Makefile.am
+++ b/Build/source/utils/xindy/binaries/Makefile.am
@@ -21,7 +21,7 @@
## Boston, MA 02110-1301 USA.
# some global variables
-SRCDIR = ../src
+SRCDIR = $(top_srcdir)/src
FAS = base.fas locref.fas idxstyle.fas index.fas version.fas markup.fas
DEFAULTS = defaults.xdy
DUMP_XINDY = $(SRCDIR)/dump-xindy.lsp
diff --git a/Build/source/utils/xindy/make-rules/alphabets/Makefile.am b/Build/source/utils/xindy/make-rules/alphabets/Makefile.am
index 8c1521f58b5..37313ea7eff 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/Makefile.am
+++ b/Build/source/utils/xindy/make-rules/alphabets/Makefile.am
@@ -729,7 +729,7 @@ nodist_vietnamese_DATA = $(VIETNAMESE)
iconv -f UTF-8 -t CP850 >$@
romanian/latin2.pl : romanian/utf8.pl
- sed -e 's/@u{\([^}]*\)}//g;' -f rom-comma-kludge.sed <$< | \
+ sed -e 's/@u{\([^}]*\)}//g;' -f $(srcdir)/rom-comma-kludge.sed <$< | \
iconv -f UTF-8 -t ISO8859-2 >$@
%latin2.pl : %utf8.pl.in
@@ -765,7 +765,7 @@ romanian/latin2.pl : romanian/utf8.pl
iconv -f UTF-8 -t ISO-8859-15 >$@
romanian/cp1250.pl : romanian/utf8.pl
- sed -e 's/@u{\([^}]*\)}//g;' -f rom-comma-kludge.sed <$< | \
+ sed -e 's/@u{\([^}]*\)}//g;' -f $(srcdir)/rom-comma-kludge.sed <$< | \
iconv -f UTF-8 -t CP1250 >$@
%cp1250.pl : %utf8.pl.in
@@ -792,8 +792,8 @@ romanian/cp1250.pl : romanian/utf8.pl
sed -e 's/@u{\([^}]*\)}//g;' <$< | \
iconv -f UTF-8 -t KOI8-U >$@
-# %tex.pl : %utf8.pl utf8-to-tex.sed
-# sed -f utf8-to-tex.sed <$< >$@
+# %tex.pl : %utf8.pl $(srcdir)/utf8-to-tex.sed
+# sed -f $(srcdir)/utf8-to-tex.sed <$< >$@
@@ -802,13 +802,13 @@ romanian/cp1250.pl : romanian/utf8.pl
sed -n '1,10 p' <$< >$@
%-test.xdy : %.pl
- perl $< $*
+ perl -I$(srcdir) $< $* $(srcdir)
%-doc.tex : %.pl
- perl $< $*
+ perl -I$(srcdir) $< $* $(srcdir)
%.xdy : %.pl
- perl $< $*
+ perl -I$(srcdir) $< $* $(srcdir)
SUBDIRS = \
albanian \
@@ -1145,15 +1145,15 @@ alphabets-inc.tex : $(DOCS)
# for i in $(DOCS_UTF8); do echo "\input{$$i}" >>$@; done
# echo "\ienc{utf8}" >>$@
+docdir = $(datadir)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+
# whether to build docs
if BUILDRULES
if BUILDDOCS
-alphabets-doc.pdf : alphabets-doc.tex alphabets-inc.tex
- pdflatex -interaction batchmode alphabets-doc.tex
- pdflatex -interaction batchmode alphabets-doc.tex
-
-docdir = $(datadir)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+alphabets-doc.pdf : $(srcdir)/alphabets-doc.tex alphabets-inc.tex
+ pdflatex -interaction batchmode $(srcdir)/alphabets-doc.tex
+ pdflatex -interaction batchmode $(srcdir)/alphabets-doc.tex
PDFS = alphabets-doc.pdf
diff --git a/Build/source/utils/xindy/make-rules/alphabets/make-rules.pl b/Build/source/utils/xindy/make-rules/alphabets/make-rules.pl
index a2b5040d5ed..c5a50a6014d 100755
--- a/Build/source/utils/xindy/make-rules/alphabets/make-rules.pl
+++ b/Build/source/utils/xindy/make-rules/alphabets/make-rules.pl
@@ -23,7 +23,8 @@ print TESTXDY " :rule-set (\"".$prefix."resolve-case\" \"".$prefix."ignore
print TESTXDY "(use-rule-set :run 3\n";
print TESTXDY " :rule-set (\"".$prefix."resolve-special\"))\n";
close TESTXDY;
-system("cat test.xdy >> $ARGV[0]-test.xdy");
+my $srcdir = "."; $srcdir = $ARGV[1] if defined $ARGV[1];
+system("cat $srcdir/test.xdy >> $ARGV[0]-test.xdy");
$begin = 128;
# $begin = 97 if ($script eq "cyrillic");
diff --git a/Build/source/utils/xindy/make-rules/inputenc/Makefile.am b/Build/source/utils/xindy/make-rules/inputenc/Makefile.am
index 468897b6f48..d091682fff5 100644
--- a/Build/source/utils/xindy/make-rules/inputenc/Makefile.am
+++ b/Build/source/utils/xindy/make-rules/inputenc/Makefile.am
@@ -46,9 +46,9 @@ latin.xdy : latin1.xdy latin2.xdy latin3.xdy
sort -u latin?.xdy | grep -v '^;' >>latin.xdy
%.xdy %.idx :
- perl ./make-testidx.pl TS1,T2A,T1 $* >$*.tex
+ perl $(srcdir)/make-testidx.pl TS1,T2A,T1 $* >$*.tex
latex -interaction batchmode $*.tex
- perl ./make-inp-rules.pl <$*.idx >$*.xdy
+ perl $(srcdir)/make-inp-rules.pl <$*.idx >$*.xdy
PERLSCRIPTS = \
make-inp-rules.pl \
diff --git a/Build/source/utils/xindy/rte/Makefile.am b/Build/source/utils/xindy/rte/Makefile.am
index 1e0957ec8dd..f1c852e57cc 100644
--- a/Build/source/utils/xindy/rte/Makefile.am
+++ b/Build/source/utils/xindy/rte/Makefile.am
@@ -72,9 +72,12 @@ check:
$(MAKE) -C $(clisp_builddir) check || $(MAKE) -C $(clisp_builddir) check
endif
+ORDRULES_FILES = ordrules.c ordrules.h rxsub.c rxsub.h mkind.h debug.h link.sh
+
xindy-build-dir: $(CLISP_PREREQ)
$(RM_R) xindy-build-dir
$(MAKE) -C ordrules ordrulei.c
+ test -f ordrules/link.sh || for i in $(ORDRULES_FILES); do cp $(top_srcdir)/rte/ordrules/$$i ordrules/; done
$(clisp_link) add-module-set ordrules $(fulldir) $@
cp $@/lisp.run $(binariesdir)/xindy.run
cp $@/lispinit.mem $(binariesdir)/base.mem
diff --git a/Build/source/utils/xindy/rte/ordrules/Makefile.in b/Build/source/utils/xindy/rte/ordrules/Makefile.in
index fa329f6ed85..72099d09c7e 100644
--- a/Build/source/utils/xindy/rte/ordrules/Makefile.in
+++ b/Build/source/utils/xindy/rte/ordrules/Makefile.in
@@ -6,6 +6,8 @@
#
# copied from CLISP module regex
+@SET_MAKE@
+srcdir = @srcdir@
CC = @CC@
CPPFLAGS = @CPPFLAGS@
CFLAGS = @CFLAGS@
@@ -15,8 +17,8 @@ CLISP = $(CLISP_PATH) -q -norc
all : ordrulei.o ordrules.o rxsub.o
-ordrulei.c : ordrulei.lsp
- $(CLISP) -c ordrulei.lsp
+ordrulei.c : $(srcdir)/ordrulei.lsp
+ $(CLISP) -c $(srcdir)/ordrulei.lsp -o ordrulei.fas
ordrulei.o : ordrulei.c
$(CC) $(CFLAGS) -I$(INCLUDES) -c ordrulei.c
diff --git a/Build/source/utils/xindy/user-commands/Makefile.am b/Build/source/utils/xindy/user-commands/Makefile.am
index 394d5d72c49..956cb389363 100644
--- a/Build/source/utils/xindy/user-commands/Makefile.am
+++ b/Build/source/utils/xindy/user-commands/Makefile.am
@@ -23,15 +23,15 @@
bin_SCRIPTS = xindy xindy.v2
xindy: xindy.in
- sed -e 's:@libdir\@:$(libdir):' xindy.in >xindy
+ sed -e 's:@libdir\@:$(libdir):' $(srcdir)/xindy.in >xindy
xindy.v2: xindy.v2.in
- sed -e 's:@XINDY_PERL\@:/usr/bin/perl:' xindy.v2.in >xindy.v2
+ sed -e 's:@XINDY_PERL\@:/usr/bin/perl:' $(srcdir)/xindy.v2.in >xindy.v2
-xindy.1: xindy.in
+$(srcdir)/xindy.1: $(srcdir)/xindy.in
pod2man --verbose -n XINDY -r "Version 1.8" -c "xindy" $< $@
-texindy.1: texindy
+$(srcdir)/texindy.1: $(srcdir)/texindy
pod2man --verbose -n TEXINDY -r "Version 1.5" -c "xindy" $< $@
dist_bin_SCRIPTS = texindy