Commit 10a9be64 authored by Agustin Martin Domingo's avatar Agustin Martin Domingo

Use generic ${MAKE} in doc/Makedoc.sh rather than harcoded "make". Thanks Ilya...

Use generic ${MAKE} in doc/Makedoc.sh rather than harcoded "make". Thanks Ilya Tumaykin (aka Coacher).
Signed-off-by: default avatarAgustin Martin Domingo <agmartin@debian.org>
parent 3a69d8bd
......@@ -83,13 +83,14 @@ ifneq ($(BUILDDOC_FORMATS),)
# -- Build documentation
@echo "Building documentation ..."
(cd doc; \
MAKE="$(MAKE)" \
PREFIX=$(prefix) \
BUILD_ISO_ENTITIES=$(BUILD_ISO_ENTITIES) \
BUILD_ENTITY_MAP=$(BUILD_ENTITY_MAP) \
PKGPERL5LIB=$(CURDIR)/perl5lib \
PKGDATADIR=$(CURDIR)/lib \
PKGPERL5LIB=$(CURDIR)/perl5lib \
PKGDATADIR=$(CURDIR)/lib \
PKGENTITYMAPDIR=$(CURDIR)/entity-map \
BUILDDOC_FORMATS="$(BUILDDOC_FORMATS)" \
BUILDDOC_FORMATS="$(BUILDDOC_FORMATS)" \
sh Makedoc.sh)
endif
......
......@@ -33,7 +33,7 @@ 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"
${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'
......@@ -49,7 +49,7 @@ fi
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"
${MAKE} -C ../iso-entities install DESTDIR="$TMPDIR"
ISOENTITIES_PREFIX="${TMPDIR}/usr"
else
# --with-installed-iso-entities: Use system prefix.
......@@ -157,7 +157,7 @@ for docformat in ${BUILDDOC_FORMATS}; do
esac
done
make TMPDIR="${TMPDIR}" DVIPS_PAPER="${DVIPS_PAPER}" ${BUILDDOC_MAKE}
${MAKE} TMPDIR="${TMPDIR}" DVIPS_PAPER="${DVIPS_PAPER}" ${BUILDDOC_MAKE}
# Remove temporary directory.
rm -rf "${TMPDIR}"
......
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