summaryrefslogtreecommitdiff
path: root/Build/source/utils/xindy-new/xindy-2.4-pre2-PATCHES/patch-25-subst-in-texindy
blob: 62b6b633c945412550cad3178339520b94c5368f (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
	Substitute the value of $(libdir) also in texindy (for TL).

	IMPORTANT: This patch requires to first rename
	user-commands/texindy => user-commands/texindy.in
	(and remove the execute permissions).

diff -ur -x Makefile.in -x autom4te.cache xindy.orig/user-commands/Makefile.am xindy/user-commands/Makefile.am
--- xindy.orig/user-commands/Makefile.am	2009-12-09 14:17:56.000000000 +0100
+++ xindy/user-commands/Makefile.am	2009-12-10 13:53:42.000000000 +0100
@@ -25,13 +25,12 @@
 bin_SCRIPTS =
 
 if TEXLIVE_BUILD
-noinst_SCRIPTS = $(scripts)
 scriptspath = texmf/scripts/xindy
 scriptsdir = ${prefix}/$(scriptspath)
-install-exec-hook: $(scripts)
+install-exec-hook:
 	$(MKDIR_P) "$(DESTDIR)$(scriptsdir)"
 	@for f in $(scripts); do \
-	  $(INSTALL_SCRIPT) `test -f "$$f" || echo "$(srcdir)/"`$$f $(DESTDIR)$(scriptsdir)/$$f.pl; \
+	  $(INSTALL_SCRIPT) "$(srcdir)/$$f.in" "$(DESTDIR)$(scriptsdir)/$$f.pl"; \
 	done
 	case "$(bindir)" in \
 	  */bin) $(MAKE) $(AM_MAKEFLAGS) REL=.. install-links;; \
@@ -41,34 +40,34 @@
 	esac
 .PHONY: install-links
 install-links:
-	@cd $(DESTDIR)$(bindir) && \
+	@cd "$(DESTDIR)$(bindir)" && \
 	for f in $(scripts); do \
 	  rm -f $$f; \
-	  echo "creating link '$$f -> '$(REL)/$(scriptspath)/$$f.pl"; \
+	  echo "creating link '$$f' -> '$(REL)/$(scriptspath)/$$f.pl'"; \
 	  $(LN_S) $(REL)/$(scriptspath)/$$f.pl $$f; \
 	done
 uninstall-hook:
 	@for f in $(scripts); do \
-	  rm -f $(DESTDIR)$(bindir)/$$f; \
-	  rm -f $(DESTDIR)$(scriptsdir)/$$f.pl; \
+	  rm -f "$(DESTDIR)$(bindir)/$$f"; \
+	  rm -f "$(DESTDIR)$(scriptsdir)/$$f.pl"; \
 	done
-
-xindy: xindy.in
-	cat $(srcdir)/xindy.in >xindy
 else !TEXLIVE_BUILD
 bin_SCRIPTS += $(scripts)
 
+texindy: texindy.in Makefile
+	sed -e 's:@libdir\@:$(libdir):' $(srcdir)/texindy.in >texindy
+
 xindy: xindy.in Makefile
 	sed -e 's:@libdir\@:$(libdir):' $(srcdir)/xindy.in >xindy
 endif !TEXLIVE_BUILD
 
 man_MANS = texindy.1 xindy.1
 
-EXTRA_DIST = $(man_MANS) texindy xindy.in
+EXTRA_DIST = $(man_MANS) texindy.in xindy.in
 
 ## Obsolete files
 ##
 EXTRA_DIST += xindy.v2.1 xindy.v2.in
 
-CLEANFILES = xindy
+CLEANFILES = $(scripts)