6 files changed, 32 insertions, 28 deletions
diff --git a/Build/source/utils/xindy/tex2xindy/Makefile.am b/Build/source/utils/xindy/tex2xindy/Makefile.am
index e6a0d60b8aa..78c47de839a 100644
--- a/Build/source/utils/xindy/tex2xindy/Makefile.am
+++ b/Build/source/utils/xindy/tex2xindy/Makefile.am
@@ -34,13 +34,14 @@ CLEANFILES = tex2xindy.c
 dist-hook:
 	rm -f $(distdir)/tex2xindy.c
 
-IDENT_DATE = `ident $< | grep '\$$Id' | sed -e 's/^.*,v [^ ]* //' -e 's/ .*//' -e s:/:-:g`
-IDENT_VERSION = `ident $< | grep '\$$Id' | sed -e 's/^.*,v //' -e 's/ .*//'`
+POD_DATE = `ident $< | grep '\$$Id' | sed -e 's/^.*,v [^ ]* //' -e 's/ .*//' -e s:/:-:g`
+POD_VERSION = `ident $< | grep '\$$Id' | sed -e 's/^.*,v //' -e 's/ .*//'`
+POD_NAME = `basename $@ .1 | tr '[a-z]' '[A-Z]'`
 POD2MAN = pod2man
 
 $(srcdir)/tex2xindy.1: $(srcdir)/tex2xindy.l
 	-$(POD2MAN) --center '$(PACKAGE_NAME)' \
-		--name=$(basename $@ .1 | tr '[a-z]' '[A-Z]') \
-		--release "Version $(IDENT_VERSION)" \
-		--date "$(IDENT_DATE)" \
+		--name="$(POD_NAME)" \
+		--release "Version $(POD_VERSION)" \
+		--date "$(POD_DATE)" \
 		$< $@
diff --git a/Build/source/utils/xindy/tex2xindy/Makefile.in b/Build/source/utils/xindy/tex2xindy/Makefile.in
index 84f737c8d8b..5c851b83e36 100644
--- a/Build/source/utils/xindy/tex2xindy/Makefile.in
+++ b/Build/source/utils/xindy/tex2xindy/Makefile.in
@@ -174,8 +174,9 @@ tex2xindy_LDADD = @LEXLIB@
 man_MANS = tex2xindy.1
 EXTRA_DIST = $(man_MANS)
 CLEANFILES = tex2xindy.c
-IDENT_DATE = `ident $< | grep '\$$Id' | sed -e 's/^.*,v [^ ]* //' -e 's/ .*//' -e s:/:-:g`
-IDENT_VERSION = `ident $< | grep '\$$Id' | sed -e 's/^.*,v //' -e 's/ .*//'`
+POD_DATE = `ident $< | grep '\$$Id' | sed -e 's/^.*,v [^ ]* //' -e 's/ .*//' -e s:/:-:g`
+POD_VERSION = `ident $< | grep '\$$Id' | sed -e 's/^.*,v //' -e 's/ .*//'`
+POD_NAME = `basename $@ .1 | tr '[a-z]' '[A-Z]'`
 POD2MAN = pod2man
 all: all-am
 
@@ -467,9 +468,9 @@ dist-hook:
 
 $(srcdir)/tex2xindy.1: $(srcdir)/tex2xindy.l
 	-$(POD2MAN) --center '$(PACKAGE_NAME)' \
-		--name=$(basename $@ .1 | tr '[a-z]' '[A-Z]') \
-		--release "Version $(IDENT_VERSION)" \
-		--date "$(IDENT_DATE)" \
+		--name="$(POD_NAME)" \
+		--release "Version $(POD_VERSION)" \
+		--date "$(POD_DATE)" \
 		$< $@
 # 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/user-commands/Makefile.am b/Build/source/utils/xindy/user-commands/Makefile.am
index 9b317bbc5df..92b37b15825 100644
--- a/Build/source/utils/xindy/user-commands/Makefile.am
+++ b/Build/source/utils/xindy/user-commands/Makefile.am
@@ -47,20 +47,21 @@ EXTRA_DIST = $(man_MANS)
 
 CLEANFILES = xindy xindy.v2
 
-IDENT_DATE = `ident $< | grep '\$$Id' | sed -e 's/^.*,v [^ ]* //' -e 's/ .*//' -e s:/:-:g`
-IDENT_VERSION = `ident $< | grep '\$$Id' | sed -e 's/^.*,v //' -e 's/ .*//'`
+POD_DATE = `ident $< | grep '\$$Id' | sed -e 's/^.*,v [^ ]* //' -e 's/ .*//' -e s:/:-:g`
+POD_VERSION = `ident $< | grep '\$$Id' | sed -e 's/^.*,v //' -e 's/ .*//'`
+POD_NAME = `basename $@ .1 | tr '[a-z]' '[A-Z]'`
 POD2MAN = pod2man
 
 $(srcdir)/xindy.1: $(srcdir)/xindy.in
 	-$(POD2MAN) --center '$(PACKAGE_NAME)' \
-		--name=$(basename $@ .1 | tr '[a-z]' '[A-Z]') \
-		--release "Version $(IDENT_VERSION)" \
-		--date "$(IDENT_DATE)" \
+		--name="$(POD_NAME)" \
+		--release "Version $(POD_VERSION)" \
+		--date "$(POD_DATE)" \
 		$< $@
 
 $(srcdir)/texindy.1: $(srcdir)/texindy
 	-$(POD2MAN) --center '$(PACKAGE_NAME)' \
-		--name=$(basename $@ .1 | tr '[a-z]' '[A-Z]') \
-		--release "Version $(IDENT_VERSION)" \
-		--date "$(IDENT_DATE)" \
+		--name="$(POD_NAME)" \
+		--release "Version $(POD_VERSION)" \
+		--date "$(POD_DATE)" \
 		$< $@
diff --git a/Build/source/utils/xindy/user-commands/Makefile.in b/Build/source/utils/xindy/user-commands/Makefile.in
index 883cb919511..5b6030e9cc9 100644
--- a/Build/source/utils/xindy/user-commands/Makefile.in
+++ b/Build/source/utils/xindy/user-commands/Makefile.in
@@ -164,8 +164,9 @@ man_MANS = texindy.1 xindy.1
 dist_noinst_MANS = xindy.v2.1 makeindex4.1
 EXTRA_DIST = $(man_MANS)
 CLEANFILES = xindy xindy.v2
-IDENT_DATE = `ident $< | grep '\$$Id' | sed -e 's/^.*,v [^ ]* //' -e 's/ .*//' -e s:/:-:g`
-IDENT_VERSION = `ident $< | grep '\$$Id' | sed -e 's/^.*,v //' -e 's/ .*//'`
+POD_DATE = `ident $< | grep '\$$Id' | sed -e 's/^.*,v [^ ]* //' -e 's/ .*//' -e s:/:-:g`
+POD_VERSION = `ident $< | grep '\$$Id' | sed -e 's/^.*,v //' -e 's/ .*//'`
+POD_NAME = `basename $@ .1 | tr '[a-z]' '[A-Z]'`
 POD2MAN = pod2man
 all: all-am
 
@@ -412,16 +413,16 @@ xindy.v2: xindy.v2.in
 
 $(srcdir)/xindy.1: $(srcdir)/xindy.in
 	-$(POD2MAN) --center '$(PACKAGE_NAME)' \
-		--name=$(basename $@ .1 | tr '[a-z]' '[A-Z]') \
-		--release "Version $(IDENT_VERSION)" \
-		--date "$(IDENT_DATE)" \
+		--name="$(POD_NAME)" \
+		--release "Version $(POD_VERSION)" \
+		--date "$(POD_DATE)" \
 		$< $@
 
 $(srcdir)/texindy.1: $(srcdir)/texindy
 	-$(POD2MAN) --center '$(PACKAGE_NAME)' \
-		--name=$(basename $@ .1 | tr '[a-z]' '[A-Z]') \
-		--release "Version $(IDENT_VERSION)" \
-		--date "$(IDENT_DATE)" \
+		--name="$(POD_NAME)" \
+		--release "Version $(POD_VERSION)" \
+		--date "$(POD_DATE)" \
 		$< $@
 # 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/user-commands/texindy.1 b/Build/source/utils/xindy/user-commands/texindy.1
index 297c1796738..33fbdaef2c8 100644
--- a/Build/source/utils/xindy/user-commands/texindy.1
+++ b/Build/source/utils/xindy/user-commands/texindy.1
@@ -129,7 +129,7 @@
 .\" ========================================================================
 .\"
 .IX Title "TEXINDY 1"
-.TH TEXINDY 1 "2008-03-19" "Version 1.5" "xindy"
+.TH TEXINDY 1 "2006-07-30" "Version 1.5" "xindy"
 .SH "NAME"
 texindy \- create sorted and tagged index from raw LaTeX index
 .SH "SYNOPSIS"
diff --git a/Build/source/utils/xindy/user-commands/xindy.1 b/Build/source/utils/xindy/user-commands/xindy.1
index 81dd68c75c4..aa25998d641 100644
--- a/Build/source/utils/xindy/user-commands/xindy.1
+++ b/Build/source/utils/xindy/user-commands/xindy.1
@@ -129,7 +129,7 @@
 .\" ========================================================================
 .\"
 .IX Title "XINDY 1"
-.TH XINDY 1 "2008-03-19" "Version 1.8" "xindy"
+.TH XINDY 1 "2006-07-30" "Version 1.8" "xindy"
 .SH "NAME"
 xindy \- create sorted and tagged index from raw index
 .SH "SYNOPSIS"