[xml/sgml-commit] [linuxdoc-tools] 05/16: Use a specific prefix variable ($isoentities_prefix) for iso-entities location.

[Agustín Martín Domingo]

This is an automated email from the git hooks/post-receive script.

agmartin pushed a commit to branch upstream
in repository linuxdoc-tools.

commit 7701cf8f3387f59d0c4e01154510d022d21edd33
Author: Agustin Martin Domingo <agmartin at debian.org>
Date:   Tue Oct 13 20:10:28 2015 +0200

    Use a specific prefix variable ($isoentities_prefix) for iso-entities location.
    
    Signed-off-by: Agustin Martin Domingo <agmartin at debian.org>
---
 Makefile.in               |  3 ++-
 bin/linuxdoc.in           | 13 +++++++++----
 doc/Makedoc.sh            | 15 ++++++++-------
 perl5lib/LinuxDocTools.pm |  4 ++--
 4 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 4bb6c01..60854a0 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -2,7 +2,7 @@
 #  Makefile.in
 #
 #  Copyright (C) 1996 Sven Rudolph
-#  Copyright (C) 2008-2013 Agustin Martin
+#  Copyright (C) 2008-2015 Agustin Martin
 
 prefix             = @prefix@
 exec_prefix        = @exec_prefix@
@@ -194,6 +194,7 @@ endif
 
 bin/linuxdoc:: Makefile bin/linuxdoc.in
 	sed -e 's!\@prefix\@!$(prefix)!g' \
+	    -e 's!\@isoentities_prefix\@!$(prefix)!g' \
 	    -e 's!\@auxbindir\@!$(auxbindir)!g' \
 	    -e 's!\@pkgdatadir\@!$(pkgdatadir)!g' \
 	    -e 's!\@perl5libdir\@!$(perl5libdir)!g' \
diff --git a/bin/linuxdoc.in b/bin/linuxdoc.in
index 0b85617..79c5bb0 100755
--- a/bin/linuxdoc.in
+++ b/bin/linuxdoc.in
@@ -14,11 +14,16 @@ sub BEGIN {
 
 use strict;
 
-use vars qw($prefix $DataDir $AuxBinDir $progs);
+use vars qw($prefix
+	    $isoentities_prefix
+	    $DataDir
+	    $AuxBinDir
+	    $progs);
 
-$prefix      = "@prefix@";
-$DataDir     = "@pkgdatadir@";
-$AuxBinDir   = "@auxbindir@";
+$prefix             = "@prefix@";
+$isoentities_prefix = "@isoentities_prefix@";
+$DataDir            = "@pkgdatadir@";
+$AuxBinDir          = "@auxbindir@";
 
 use lib "@pkgdatadir@";
 use lib "@perl5libdir@";
diff --git a/doc/Makedoc.sh b/doc/Makedoc.sh
index a9f951e..3fa2154 100644
--- a/doc/Makedoc.sh
+++ b/doc/Makedoc.sh
@@ -56,13 +56,14 @@ export PATH=${PATH}:${TMP_BINDIR}
 
 # Create a linuxdoc copy using our temporary locations.
 sed < ../bin/linuxdoc.in > $TMPDIR/linuxdoc \
- -e 's!\@prefix\@!'${TMPDIR}/usr'!g' \
- -e 's!\@auxbindir\@!'${TMP_BINDIR}'!g' \
- -e 's!\@pkgdatadir\@!'${TMPDATADIR}'!g' \
- -e 's!\@perl5libdir\@!'${TMPDIR}'!g' \
- -e 's!\@GROFFMACRO\@!-ms!g' \
- -e 's!\@PERL\@!'${PERL}'!g' \
- -e 's!\@PERLWARN\@!!g'
+  -e 's!\@prefix\@!'${TMPDIR}/usr'!g' \
+  -e 's!\@isoentities_prefix\@!'${TMPDIR}/usr'!g' \
+  -e 's!\@auxbindir\@!'${TMP_BINDIR}'!g' \
+  -e 's!\@pkgdatadir\@!'${TMPDATADIR}'!g' \
+  -e 's!\@perl5libdir\@!'${TMPDIR}'!g' \
+  -e 's!\@GROFFMACRO\@!-ms!g' \
+  -e 's!\@PERL\@!'${PERL}'!g' \
+  -e 's!\@PERLWARN\@!!g'
 
 chmod u+x $TMPDIR/linuxdoc
 
diff --git a/perl5lib/LinuxDocTools.pm b/perl5lib/LinuxDocTools.pm
index c3077ff..06a4ce0 100644
--- a/perl5lib/LinuxDocTools.pm
+++ b/perl5lib/LinuxDocTools.pm
@@ -416,8 +416,8 @@ sub process_options {
 
   # Setup the SGML environment.`iso-entites' sub directory will be removed for Debian package
   # and entities from Debian sgml-data package used if present (first entry below).
-  my @sgmlcatalogs = ( "$main::prefix/share/sgml/entities/sgml-iso-entities-8879.1986/catalog",
-		       "$main::prefix/share/sgml/iso-entities-8879.1986/iso-entities.cat",
+  my @sgmlcatalogs = ( "$main::isoentities_prefix/share/sgml/entities/sgml-iso-entities-8879.1986/catalog",
+		       "$main::isoentities_prefix/share/sgml/iso-entities-8879.1986/iso-entities.cat",
 		       "$main::DataDir/linuxdoc-tools.catalog",
 		       "/etc/sgml.catalog");
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-xml-sgml/linuxdoc-tools.git