[xml/sgml-commit] [linuxdoc-tools] 06/16: Fix --with-installed-iso-entities regression introduced with build/install doc separation.

[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 cb70069a1ca3a94cec376d9162cbfe60aefac6ee
Author: Agustin Martin Domingo <agmartin at debian.org>
Date:   Tue Oct 13 20:14:07 2015 +0200

    Fix --with-installed-iso-entities regression introduced with build/install doc separation.
    
    Should now deal properly with it. Will use TMPDIR location if using own
    iso-entities and system prefix if using installed ones.
    
    Thanks Ilya Tumaykin for finding this problem and reporting it.
    
    Signed-off-by: Agustin Martin Domingo <agmartin at debian.org>
---
 Makefile.in    |  2 ++
 doc/Makedoc.sh | 14 +++++++++++---
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 60854a0..5abc22a 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -83,6 +83,8 @@ ifneq ($(BUILDDOC_FORMATS),)
 #    -- Build documentation
 	@echo "Building documentation ..."
 	(cd doc; \
+		PREFIX=$(prefix) \
+		BUILD_ISO_ENTITIES=$(BUILD_ISO_ENTITIES) \
 	 	PKGPERL5LIB=$(CURDIR)/perl5lib \
 	 	PKGDATADIR=$(CURDIR)/lib \
 		PKGENTITYMAPDIR=$(CURDIR)/entity-map \
diff --git a/doc/Makedoc.sh b/doc/Makedoc.sh
index 3fa2154..5ee68e8 100644
--- a/doc/Makedoc.sh
+++ b/doc/Makedoc.sh
@@ -40,8 +40,16 @@ 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'
 
-# Same for iso-entities, need it installed in "$TMPDIR"
-make -C ../iso-entities install DESTDIR="$TMPDIR"
+# Set prefix for iso-entities location and make it available if needed.
+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"
+else
+    # --with-installed-iso-entities: Use system prefix.
+    ISOENTITIES_PREFIX="${PREFIX}"
+fi
 
 # Make sure our binaries are available in doc build environment
 TMP_BINDIR=${TMPDIR}/bin
@@ -57,7 +65,7 @@ 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!\@isoentities_prefix\@!'${TMPDIR}/usr'!g' \
+  -e 's!\@isoentities_prefix\@!'${ISOENTITIES_PREFIX}'!g' \
   -e 's!\@auxbindir\@!'${TMP_BINDIR}'!g' \
   -e 's!\@pkgdatadir\@!'${TMPDATADIR}'!g' \
   -e 's!\@perl5libdir\@!'${TMPDIR}'!g' \

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