[xml/sgml-commit] [linuxdoc-tools] 10/17: doc/Makedoc.sh: Make sure ${PREFIX} is honoured where needed. Thanks Felix Palmen.

[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 7de8370bcbea428e59b83dd38c2631c5dd60bfea
Author: Agustin Martin Domingo <agmartin at debian.org>
Date:   Wed Apr 27 11:43:11 2016 +0200

    doc/Makedoc.sh: Make sure ${PREFIX} is honoured where needed. Thanks Felix Palmen.
    
     * in some places in doc/Makedoc.sh, ${PREFIX} is implicitly assumed
       to be "/usr", building of docs breaks with other values of ${PREFIX}
    
    Report and patch by Felix Palmen.
    
    Signed-off-by: Agustin Martin Domingo <agmartin at debian.org>
---
 doc/Makedoc.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/Makedoc.sh b/doc/Makedoc.sh
index da4be99..1c90f39 100644
--- a/doc/Makedoc.sh
+++ b/doc/Makedoc.sh
@@ -35,8 +35,8 @@ if [ "${BUILD_ENTITY_MAP}" = "true" ]; then
     mkdir $TMPDIR/Text
     ${MAKE} -C ../entity-map install DESTDIR="$TMPDIR"
     sed < ../entity-map/EntityMap.pm.in > $TMPDIR/Text/EntityMap.pm \
-	-e 's|\@localentitymapdir\@|'${TMPDIR}'/usr/share/entity-map|g' \
-	-e 's|\@entitymapdir\@|'${TMPDIR}'/usr/share/entity-map/0.1.0|g'
+	-e 's|\@localentitymapdir\@|'${TMPDIR}${PREFIX}'/share/entity-map|g' \
+	-e 's|\@entitymapdir\@|'${TMPDIR}${PREFIX}'/share/entity-map/0.1.0|g'
 
     # Set ${TMPDIR} first in perl load path (Will put Text dir there
     # for modified EntityMap.pm), then our perl5lib
@@ -50,7 +50,7 @@ if [ "${BUILD_ISO_ENTITIES}" = "true" ]; then
     # --without-installed-iso-entities: Install iso-entities in
     # "$TMPDIR/usr" and set it as iso-entities prefix.
     ${MAKE} -C ../iso-entities install DESTDIR="$TMPDIR"
-    ISOENTITIES_PREFIX="${TMPDIR}/usr"
+    ISOENTITIES_PREFIX="${TMPDIR}${PREFIX}"
 else
     # --with-installed-iso-entities: Use system prefix.
     ISOENTITIES_PREFIX="${PREFIX}"

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