Fix --with-installed-entity-map regression introduced with build/install doc separation.

  Only create and install in TMPDIR a special EntityMap.pm customized for
  doc build if --with-installed-entity-map is not passed.
Signed-off-by: default avatarAgustin Martin Domingo <agmartin@debian.org>
parent cb70069a
......@@ -85,6 +85,7 @@ ifneq ($(BUILDDOC_FORMATS),)
(cd doc; \
PREFIX=$(prefix) \
BUILD_ISO_ENTITIES=$(BUILD_ISO_ENTITIES) \
BUILD_ENTITY_MAP=$(BUILD_ENTITY_MAP) \
PKGPERL5LIB=$(CURDIR)/perl5lib \
PKGDATADIR=$(CURDIR)/lib \
PKGENTITYMAPDIR=$(CURDIR)/entity-map \
......
......@@ -20,9 +20,6 @@ function abort()
trap 'abort' 1 2 3 6 9 15
# Set ${TMPDIR} first in perl load path (Will put Text dir there for
# modified EntityMap.pm), then our perl5lib
export PERL5LIB=${TMPDIR}:${PKGPERL5LIB}
PERL=`which perl`
TMPDATADIR=${TMPDIR}/linuxdoc-tools
......@@ -32,13 +29,21 @@ mkdir -p ${TMPDATADIR}
cp ../tex/*.sty ${TMPDATADIR}
cp ../VERSION ${TMPDATADIR}
# Create a modified EntityMap.pm with entity-map location in doc build
# temporary dir. We need to properly install entity-map there.
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'
if [ "${BUILD_ENTITY_MAP}" = "true" ]; then
# Create a modified EntityMap.pm with entity-map location in doc
# build temporary dir. Need to properly install entity-map there.
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'
# Set ${TMPDIR} first in perl load path (Will put Text dir there
# for modified EntityMap.pm), then our perl5lib
export PERL5LIB=${TMPDIR}:${PKGPERL5LIB}
else
export PERL5LIB=${PKGPERL5LIB}
fi
# Set prefix for iso-entities location and make it available if needed.
if [ "${BUILD_ISO_ENTITIES}" = "true" ]; then
......
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