[xml/sgml-commit] [linuxdoc-tools] 02/17: Use generic ${MAKE} in doc/Makedoc.sh rather than harcoded "make". Thanks Ilya Tumaykin (aka Coacher).

[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 10a9be645b534741353ca0b6f9332837e0de74c7
Author: Agustin Martin Domingo <agmartin at debian.org>
Date:   Tue Nov 24 18:10:48 2015 +0100

    Use generic ${MAKE} in doc/Makedoc.sh rather than harcoded "make". Thanks Ilya Tumaykin (aka Coacher).
    
    Signed-off-by: Agustin Martin Domingo <agmartin at debian.org>
---
 Makefile.in    | 7 ++++---
 doc/Makedoc.sh | 6 +++---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index adb85d0..7038d97 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -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
 
diff --git a/doc/Makedoc.sh b/doc/Makedoc.sh
index bbebac8..da4be99 100644
--- a/doc/Makedoc.sh
+++ b/doc/Makedoc.sh
@@ -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}"

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