File fix-FHS.dpatch.diff of Package xindy
#! /bin/sh /usr/share/dpatch/dpatch-run
## fix-FHS.dpatch by Jörg Sommer <joerg@alea.gnuu.de>
##
## DP: All files below /usr/lib/xindy/modules/ are architecture independent
## DP: and therefor need to be below /usr/share/ as forced by the FHS.
@DPATCH@
---
make-rules/alphabets/Makefile.in | 2 +-
make-rules/inputenc/Makefile.in | 2 +-
make-rules/styles/Makefile.in | 2 +-
modules/base/Makefile.in | 2 +-
modules/class/Makefile.in | 2 +-
modules/lang/german/Makefile.in | 2 +-
modules/lang/latin/Makefile.in | 2 +-
modules/ord/Makefile.in | 2 +-
modules/rules/Makefile.in | 2 +-
modules/styles/Makefile.in | 2 +-
user-commands/xindy.in | 12 +++++++-----
11 files changed, 17 insertions(+), 15 deletions(-)
Index: xindy-2.4/make-rules/alphabets/Makefile.in
===================================================================
--- xindy-2.4.orig/make-rules/alphabets/Makefile.in
+++ xindy-2.4/make-rules/alphabets/Makefile.in
@@ -253,7 +253,7 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-langdir = $(pkglibdir)/modules/lang
+langdir = $(pkgdatadir)/lang
DISTCLEANFILES = albanian/utf8.pl belarusian/utf8.pl bulgarian/utf8.pl \
croatian/utf8.pl czech/utf8.pl danish/utf8.pl \
dutch/ij-as-ij-utf8.pl dutch/ij-as-y-utf8.pl english/utf8.pl \
Index: xindy-2.4/make-rules/inputenc/Makefile.in
===================================================================
--- xindy-2.4.orig/make-rules/inputenc/Makefile.in
+++ xindy-2.4/make-rules/inputenc/Makefile.in
@@ -154,7 +154,7 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-modulesdir = $(pkglibdir)/modules
+modulesdir = $(pkgdatadir)
inputencdir = $(modulesdir)/tex/inputenc
INPUTENCS = \
cp1250.xdy \
Index: xindy-2.4/make-rules/styles/Makefile.in
===================================================================
--- xindy-2.4.orig/make-rules/styles/Makefile.in
+++ xindy-2.4/make-rules/styles/Makefile.in
@@ -154,7 +154,7 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-modulesdir = $(pkglibdir)/modules
+modulesdir = $(pkgdatadir)
stylesdir = $(modulesdir)/styles
STYLES = \
example.xdy \
Index: xindy-2.4/modules/base/Makefile.in
===================================================================
--- xindy-2.4.orig/modules/base/Makefile.in
+++ xindy-2.4/modules/base/Makefile.in
@@ -154,7 +154,7 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-modulesdir = $(pkglibdir)/modules
+modulesdir = $(pkgdatadir)
basedir = $(modulesdir)/base
RULES = \
book-order.xdy \
Index: xindy-2.4/modules/class/Makefile.in
===================================================================
--- xindy-2.4.orig/modules/class/Makefile.in
+++ xindy-2.4/modules/class/Makefile.in
@@ -154,7 +154,7 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-modulesdir = $(pkglibdir)/modules
+modulesdir = $(pkgdatadir)
classdir = $(modulesdir)/class
RULES = \
pagenums.xdy
Index: xindy-2.4/modules/lang/german/Makefile.in
===================================================================
--- xindy-2.4.orig/modules/lang/german/Makefile.in
+++ xindy-2.4/modules/lang/german/Makefile.in
@@ -154,7 +154,7 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-langdir = $(pkglibdir)/modules/lang
+langdir = $(pkgdatadir)/lang
germandir = $(langdir)/german
RULES = \
din5007.xdy \
Index: xindy-2.4/modules/lang/latin/Makefile.in
===================================================================
--- xindy-2.4.orig/modules/lang/latin/Makefile.in
+++ xindy-2.4/modules/lang/latin/Makefile.in
@@ -154,7 +154,7 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-langdir = $(pkglibdir)/modules/lang
+langdir = $(pkgdatadir)/lang
latindir = $(langdir)/latin
RULES = \
caseisrt.xdy \
Index: xindy-2.4/modules/ord/Makefile.in
===================================================================
--- xindy-2.4.orig/modules/ord/Makefile.in
+++ xindy-2.4/modules/ord/Makefile.in
@@ -154,7 +154,7 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-modulesdir = $(pkglibdir)/modules
+modulesdir = $(pkgdatadir)
orddir = $(modulesdir)/ord
RULES = \
letorder.xdy
Index: xindy-2.4/modules/rules/Makefile.in
===================================================================
--- xindy-2.4.orig/modules/rules/Makefile.in
+++ xindy-2.4/modules/rules/Makefile.in
@@ -154,7 +154,7 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-modulesdir = $(pkglibdir)/modules
+modulesdir = $(pkgdatadir)
rulesdir = $(modulesdir)/rules
RULES = \
isolatin1-exchange.xdy \
Index: xindy-2.4/modules/styles/Makefile.in
===================================================================
--- xindy-2.4.orig/modules/styles/Makefile.in
+++ xindy-2.4/modules/styles/Makefile.in
@@ -154,7 +154,7 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-modulesdir = $(pkglibdir)/modules
+modulesdir = $(pkgdatadir)
texdir = $(modulesdir)/styles
RULES = basic.xdy makeidx.xdy
EXTRA_DIST = $(RULES)
Index: xindy-2.4/user-commands/xindy.in
===================================================================
--- xindy-2.4.orig/user-commands/xindy.in
+++ xindy-2.4/user-commands/xindy.in
@@ -414,11 +414,13 @@ if ( $real_cmd =~ /\.pl$/ ) { # TeX Live
}
# 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";
}
