support texlive installation with --disable-multiplatform option

(thanks to Peter Münster)


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

4 files changed, 26 insertions, 6 deletions

diff --git a/Build/source/utils/xindy/user-commands/Makefile.am b/Build/source/utils/xindy/user-commands/Makefile.am
index 781e657b35f..65714f9309f 100644
--- a/Build/source/utils/xindy/user-commands/Makefile.am
+++ b/Build/source/utils/xindy/user-commands/Makefile.am
@@ -25,9 +25,17 @@ install-exec-hook: xindy
 	$(MKDIR_P) "$(prefix)/texmf/scripts/xindy"
 	-rm -f $(bindir)/xindy $(bindir)/texindy
 	$(INSTALL_SCRIPT) xindy $(prefix)/texmf/scripts/xindy/xindy.pl
-	ln -s ../../texmf/scripts/xindy/xindy.pl $(bindir)/xindy
 	$(INSTALL_SCRIPT) $(srcdir)/texindy $(prefix)/texmf/scripts/xindy/texindy.pl
-	ln -s ../../texmf/scripts/xindy/texindy.pl $(bindir)/texindy
+	if test -d "$(bindir)/../../texmf/scripts/xindy"; then \
+	  ln -s ../../texmf/scripts/xindy/xindy.pl $(bindir)/xindy; \
+	  ln -s ../../texmf/scripts/xindy/texindy.pl $(bindir)/texindy; \
+	elif test -d "$(bindir)/../texmf/scripts/xindy"; then \
+	  ln -s ../texmf/scripts/xindy/xindy.pl $(bindir)/xindy; \
+	  ln -s ../texmf/scripts/xindy/texindy.pl $(bindir)/texindy; \
+	else \
+	  echo "Error: texmf/scripts/xindy directory not found"; \
+	  false; \
+	fi
 else
     bin_SCRIPTS = xindy
     dist_bin_SCRIPTS = texindy
diff --git a/Build/source/utils/xindy/user-commands/Makefile.in b/Build/source/utils/xindy/user-commands/Makefile.in
index 08e955183a9..b96a7123ef0 100644
--- a/Build/source/utils/xindy/user-commands/Makefile.in
+++ b/Build/source/utils/xindy/user-commands/Makefile.in
@@ -426,9 +426,17 @@ uninstall-man: uninstall-man1
 @TETEX_BUILD_TRUE@	$(MKDIR_P) "$(prefix)/texmf/scripts/xindy"
 @TETEX_BUILD_TRUE@	-rm -f $(bindir)/xindy $(bindir)/texindy
 @TETEX_BUILD_TRUE@	$(INSTALL_SCRIPT) xindy $(prefix)/texmf/scripts/xindy/xindy.pl
-@TETEX_BUILD_TRUE@	ln -s ../../texmf/scripts/xindy/xindy.pl $(bindir)/xindy
 @TETEX_BUILD_TRUE@	$(INSTALL_SCRIPT) $(srcdir)/texindy $(prefix)/texmf/scripts/xindy/texindy.pl
-@TETEX_BUILD_TRUE@	ln -s ../../texmf/scripts/xindy/texindy.pl $(bindir)/texindy
+@TETEX_BUILD_TRUE@	if test -d "$(bindir)/../../texmf/scripts/xindy"; then \
+@TETEX_BUILD_TRUE@	  ln -s ../../texmf/scripts/xindy/xindy.pl $(bindir)/xindy; \
+@TETEX_BUILD_TRUE@	  ln -s ../../texmf/scripts/xindy/texindy.pl $(bindir)/texindy; \
+@TETEX_BUILD_TRUE@	elif test -d "$(bindir)/../texmf/scripts/xindy"; then \
+@TETEX_BUILD_TRUE@	  ln -s ../texmf/scripts/xindy/xindy.pl $(bindir)/xindy; \
+@TETEX_BUILD_TRUE@	  ln -s ../texmf/scripts/xindy/texindy.pl $(bindir)/texindy; \
+@TETEX_BUILD_TRUE@	else \
+@TETEX_BUILD_TRUE@	  echo "Error: texmf/scripts/xindy directory not found"; \
+@TETEX_BUILD_TRUE@	  false; \
+@TETEX_BUILD_TRUE@	fi
 
 xindy: xindy.in
 	sed -e 's:@libdir\@:$(libdir):' $(srcdir)/xindy.in >xindy
diff --git a/Build/source/utils/xindy/user-commands/xindy.in b/Build/source/utils/xindy/user-commands/xindy.in
index 34563aac476..4d1195bc918 100644
--- a/Build/source/utils/xindy/user-commands/xindy.in
+++ b/Build/source/utils/xindy/user-commands/xindy.in
@@ -328,8 +328,10 @@ BEGIN {
 	$modules_dir = "$cmd_dir/../modules";
     } elsif ( -d "$lib_dir/modules" ) {	# /usr style
 	$modules_dir = "$lib_dir/modules";
-    } elsif ( -d "$lib_dir/../../texmf/xindy" ) { # texlive style
+    } elsif ( -d "$lib_dir/../../texmf/xindy" ) { # texlive multiplatform style
 	$modules_dir = "$lib_dir/../../texmf/xindy";
+    } elsif ( -d "$lib_dir/../texmf/xindy" ) { # texlive non-multiplatform style
+	$modules_dir = "$lib_dir/../texmf/xindy";
     } elsif ( -d "/usr/share/xindy" ) { # FSH style
 	$modules_dir = "/usr/share/xindy";
     } else {
diff --git a/Master/texmf/scripts/xindy/xindy.pl b/Master/texmf/scripts/xindy/xindy.pl
index 0dfdade507b..67b4a4d1298 100755
--- a/Master/texmf/scripts/xindy/xindy.pl
+++ b/Master/texmf/scripts/xindy/xindy.pl
@@ -328,8 +328,10 @@ BEGIN {
 	$modules_dir = "$cmd_dir/../modules";
     } elsif ( -d "$lib_dir/modules" ) {	# /usr style
 	$modules_dir = "$lib_dir/modules";
-    } elsif ( -d "$lib_dir/../../texmf/xindy" ) { # texlive style
+    } elsif ( -d "$lib_dir/../../texmf/xindy" ) { # texlive multiplatform style
 	$modules_dir = "$lib_dir/../../texmf/xindy";
+    } elsif ( -d "$lib_dir/../texmf/xindy" ) { # texlive non-multiplatform style
+	$modules_dir = "$lib_dir/../texmf/xindy";
     } elsif ( -d "/usr/share/xindy" ) { # FSH style
 	$modules_dir = "/usr/share/xindy";
     } else {