diff options
Diffstat (limited to 'Build')
13 files changed, 36 insertions, 30 deletions
diff --git a/Build/source/utils/xindy/make-rules/alphabets/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/Makefile.in index f2f1c2ff7ca..1f66f39f9af 100644 --- a/Build/source/utils/xindy/make-rules/alphabets/Makefile.in +++ b/Build/source/utils/xindy/make-rules/alphabets/Makefile.in @@ -252,7 +252,7 @@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -langdir = $(pkglibdir)/modules/lang +langdir = $(pkgdatadir)/lang albaniandir = $(langdir)/albanian ALBANIAN = \ albanian/latin1-lang.xdy \ @@ -2395,7 +2395,7 @@ alphabets-inc.tex : $(DOCS) echo "\section{Codepage latin9}" >>$@ for i in $(DOCS_LATIN9); do echo "\input{$$i}" >>$@; done echo "\ienc{cp1251}" >>$@ - echo "\fenc{T2A}" >>$@ + printf "%s\n" "\fenc{T2A}" >>$@ echo "\chapter{Cyrillic scripts}" >>$@ echo "\section{Codepage 1251}" >>$@ for i in $(DOCS_CYR_1251); do echo "\input{$$i}" >>$@; done @@ -2411,8 +2411,8 @@ alphabets-inc.tex : $(DOCS) # whether to build docs @BUILDDOCS_TRUE@@BUILDRULES_TRUE@alphabets-doc.pdf : alphabets-doc.tex alphabets-inc.tex -@BUILDDOCS_TRUE@@BUILDRULES_TRUE@ pdflatex alphabets-doc.tex -@BUILDDOCS_TRUE@@BUILDRULES_TRUE@ pdflatex alphabets-doc.tex +@BUILDDOCS_TRUE@@BUILDRULES_TRUE@ pdflatex -interaction batchmode alphabets-doc.tex +@BUILDDOCS_TRUE@@BUILDRULES_TRUE@ pdflatex -interaction batchmode alphabets-doc.tex # 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/make-rules/inputenc/Makefile.in b/Build/source/utils/xindy/make-rules/inputenc/Makefile.in index c544ee147e8..6faa339d2d2 100644 --- a/Build/source/utils/xindy/make-rules/inputenc/Makefile.in +++ b/Build/source/utils/xindy/make-rules/inputenc/Makefile.in @@ -156,7 +156,7 @@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -modulesdir = $(pkglibdir)/modules +modulesdir = $(pkgdatadir) inputencdir = $(modulesdir)/tex/inputenc INPUTENCS = \ cp1250.xdy \ @@ -414,7 +414,7 @@ latin.xdy : latin1.xdy latin2.xdy latin3.xdy %.xdy %.idx : perl ./make-testidx.pl TS1,T2A,T1 $* >$*.tex - latex $*.tex + latex -interaction batchmode $*.tex perl ./make-inp-rules.pl <$*.idx >$*.xdy # 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. diff --git a/Build/source/utils/xindy/make-rules/styles/Makefile.in b/Build/source/utils/xindy/make-rules/styles/Makefile.in index 18981ee0794..74b02fb5bbb 100644 --- a/Build/source/utils/xindy/make-rules/styles/Makefile.in +++ b/Build/source/utils/xindy/make-rules/styles/Makefile.in @@ -156,7 +156,7 @@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -modulesdir = $(pkglibdir)/modules +modulesdir = $(pkgdatadir) stylesdir = $(modulesdir)/styles STYLES = \ example.xdy \ diff --git a/Build/source/utils/xindy/modules/base/Makefile.in b/Build/source/utils/xindy/modules/base/Makefile.in index 3a79a1a2665..a0c983401ba 100644 --- a/Build/source/utils/xindy/modules/base/Makefile.in +++ b/Build/source/utils/xindy/modules/base/Makefile.in @@ -156,7 +156,7 @@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -modulesdir = $(pkglibdir)/modules +modulesdir = $(pkgdatadir) basedir = $(modulesdir)/base RULES = \ book-order.xdy \ diff --git a/Build/source/utils/xindy/modules/class/Makefile.in b/Build/source/utils/xindy/modules/class/Makefile.in index 6e50c9370a5..4ff87610f67 100644 --- a/Build/source/utils/xindy/modules/class/Makefile.in +++ b/Build/source/utils/xindy/modules/class/Makefile.in @@ -156,7 +156,7 @@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -modulesdir = $(pkglibdir)/modules +modulesdir = $(pkgdatadir) classdir = $(modulesdir)/class RULES = \ pagenums.xdy diff --git a/Build/source/utils/xindy/modules/lang/german/Makefile.in b/Build/source/utils/xindy/modules/lang/german/Makefile.in index d12b0aae5d2..6cc66370c88 100644 --- a/Build/source/utils/xindy/modules/lang/german/Makefile.in +++ b/Build/source/utils/xindy/modules/lang/german/Makefile.in @@ -156,7 +156,7 @@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -langdir = $(pkglibdir)/modules/lang +langdir = $(pkgdatadir)/lang germandir = $(langdir)/german RULES = \ din5007.xdy \ diff --git a/Build/source/utils/xindy/modules/lang/latin/Makefile.in b/Build/source/utils/xindy/modules/lang/latin/Makefile.in index d3260a55e62..b622a3e1978 100644 --- a/Build/source/utils/xindy/modules/lang/latin/Makefile.in +++ b/Build/source/utils/xindy/modules/lang/latin/Makefile.in @@ -156,7 +156,7 @@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -langdir = $(pkglibdir)/modules/lang +langdir = $(pkgdatadir)/lang latindir = $(langdir)/latin RULES = \ caseisrt.xdy \ diff --git a/Build/source/utils/xindy/modules/ord/Makefile.in b/Build/source/utils/xindy/modules/ord/Makefile.in index 632cf28505b..4a9ea3c97e7 100644 --- a/Build/source/utils/xindy/modules/ord/Makefile.in +++ b/Build/source/utils/xindy/modules/ord/Makefile.in @@ -156,7 +156,7 @@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -modulesdir = $(pkglibdir)/modules +modulesdir = $(pkgdatadir) orddir = $(modulesdir)/ord RULES = \ letorder.xdy diff --git a/Build/source/utils/xindy/modules/rules/Makefile.in b/Build/source/utils/xindy/modules/rules/Makefile.in index b561829b053..84db2472f02 100644 --- a/Build/source/utils/xindy/modules/rules/Makefile.in +++ b/Build/source/utils/xindy/modules/rules/Makefile.in @@ -156,7 +156,7 @@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -modulesdir = $(pkglibdir)/modules +modulesdir = $(pkgdatadir) rulesdir = $(modulesdir)/rules RULES = \ isolatin1-exchange.xdy \ diff --git a/Build/source/utils/xindy/src/base.lsp b/Build/source/utils/xindy/src/base.lsp index 657ced84c7a..4158d212f7b 100644 --- a/Build/source/utils/xindy/src/base.lsp +++ b/Build/source/utils/xindy/src/base.lsp @@ -34,7 +34,7 @@ (export '(simple-condition-format-string))) ;; line 133 "base.nw" (defmacro info (&rest msg) - `(APPLY #'FORMAT *ERROR-OUTPUT* (LIST ,@msg))) + `(APPLY #'FORMAT *STANDARD-OUTPUT* (LIST ,@msg))) ;; line 138 "base.nw" (defparameter *nraw-error-message* "~&WARNING: ") diff --git a/Build/source/utils/xindy/user-commands/texindy b/Build/source/utils/xindy/user-commands/texindy index 9c09633c2b6..441a95a4a8b 100755 --- a/Build/source/utils/xindy/user-commands/texindy +++ b/Build/source/utils/xindy/user-commands/texindy @@ -320,9 +320,7 @@ use Getopt::Long qw(:config bundling); # Check arguments, store them in proper variables. -sub usage () -{ - print STDERR <<_EOT_ +my $usage_msg = <<_EOT_ usage: $cmd [-V?h] [-qv] [-iglr] [-d magic] [-o outfile.ind] [-t log] \\ [-L lang] [-C codepage] [-M module] [-I input] [idx0 idx1 ...] @@ -347,7 +345,11 @@ GNU-STYLE LONG OPTIONS FOR SHORT OPTIONS: -I / --input-markup (supported: latex, omega) _EOT_ - ; +; + +sub usage () +{ + print STDERR $usage_msg; exit 1; } @@ -399,7 +401,7 @@ sub parse_options() { my ($german, $letter_ordering, $no_ranges); GetOptions( 'version|V' => \$output_version, - 'help|h|?' => \&usage, + 'help|h|?' => sub { print $usage_msg; exit 0; }, 'quiet|q' => \$quiet, 'verbose|v' => \$verbose, 'stdin|i' => \$stdin, diff --git a/Build/source/utils/xindy/user-commands/xindy.in b/Build/source/utils/xindy/user-commands/xindy.in index ce770275cd0..ff91c2934e3 100644 --- a/Build/source/utils/xindy/user-commands/xindy.in +++ b/Build/source/utils/xindy/user-commands/xindy.in @@ -309,11 +309,13 @@ BEGIN { } # modules directory - if ( -d "$cmd_dir/../modules" ) { # /opt style - $modules_dir = "$cmd_dir/../modules"; - } elsif ( -d "$lib_dir/modules" ) { # /usr style - $modules_dir = "$lib_dir/modules"; - } else { + $modules_dir = "/usr/share/xindy"; + unless ( -d $modules_dir ) { + #if ( -d "$cmd_dir/../modules" ) { # /opt style + # $modules_dir = "$cmd_dir/../modules"; + #} elsif ( -d "$lib_dir/modules" ) { # /usr style + # $modules_dir = "$lib_dir/modules"; + #} else { die "$cmd: Cannot locate xindy modules directory"; } } @@ -333,9 +335,7 @@ use File::Spec; # second-to-last has the extension ".xdy". Then, call the old driver # script with the original arguments... -sub usage () -{ - print STDERR <<_EOT_ +my $usage_msg = <<_EOT_ usage: $cmd [-V?h] [-qv] [-d magic] [-o outfile.ind] [-t log] \\ [-L lang] [-C codepage] [-M module] [-I input] \\ @@ -358,7 +358,11 @@ GNU-STYLE LONG OPTIONS FOR SHORT OPTIONS: -I / --input-markup (supported: latex, omega, xindy) _EOT_ - ; +; + +sub usage () +{ + print STDERR $usage_msg; exit 1; } @@ -431,7 +435,7 @@ sub parse_options() { GetOptions( 'version|V' => sub { output_version(0); }, 'internal-version' => sub { output_version(1); }, - 'help|h|?' => \&usage, + 'help|h|?' => sub { print $usage_msg; exit 0; }, 'quiet|q' => \$quiet, 'verbose|v' => \$verbose, 'debug|d=s' => \@debug, diff --git a/Build/source/utils/xindy/user-commands/xindy.v2.1 b/Build/source/utils/xindy/user-commands/xindy.v2.1 index 0afda89a76e..3a33ac6eda8 100644 --- a/Build/source/utils/xindy/user-commands/xindy.v2.1 +++ b/Build/source/utils/xindy/user-commands/xindy.v2.1 @@ -1,6 +1,6 @@ .\" Copyright (c) 1996,1997 Roger Kehr .\" See section COPYING for conditions for redistribution -.TH xindy 1L "February 1997" "Roger Kehr" "" +.TH xindy 1 "February 1997" "Roger Kehr" "" .de BP .sp .ti \-.2i |