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: default avatarAgustin Martin Domingo <agmartin@debian.org>
parent 7701cf8f
......@@ -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 \
......
......@@ -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' \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment