GNUmakefile: don't repeat BIBPATHS and MJOTEXPATHS in "make dist".

[mjotex.git] / GNUmakefile

diff --git a/GNUmakefile b/GNUmakefile
index 3f941fbeab7dd637502a99481e73c497dad57aeb..25ae0893c57ccac77cf8154db73c19a4b8ad8abd 100644 (file)
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -44,6 +44,16 @@ SAGE_LISTING_DSTS = $(patsubst %.listing,%.py,$(SAGE_LISTING_SRCS))
 #
 INDICES = $(PN)
 
+# We have to rebuild the index whenever the contents of the document
+# change, because page numbers get moved around. But when no INDICES
+# are defined, rebuilding them should be a no-op. This next definition
+# ensures that.
+ifdef INDICES
+REMAKE_INDICES = makeindex $(INDEX_SRCS)
+else
+REMAKE_INDICES = true
+endif
+
 # Use kpsewhich (from the kpathsea suite) to find the absolute paths
 # of the bibtex/mjotex files listed in in $(BIBS)/$(MJOTEX). The SRCS
 # variable should contain all (Bib)TeX source files for the document.
@@ -117,6 +127,7 @@ $(PN).pdf: $(SRCS) $(PN).bbl $(INDEX_DSTS)
                rm $@.previous; \
        else \
                mv $@ $@.previous; \
+               $(REMAKE_INDICES); \
                $(MAKE) $@; \
        fi;
 
@@ -191,7 +202,8 @@ check-boxes: $(PN).log
 .PHONY: check-chktex
 CHKTEX = chktex --localrc .chktexrc --quiet --inputfiles=0
 check-chktex:
-       @[ -z "$(shell $(CHKTEX) mjotex.sty)" ]
+       @chktexout=$$($(CHKTEX) $(PN).tex); \
+         test -z "$${chktexout}" || { echo "$${chktexout}" 1>&2; exit 1; }
 
 # Ensure that there are no undefined references in the document by
 # parsing the log file for said warnings.
@@ -232,4 +244,4 @@ clean:
 .PHONY: dist
 dist: $(PN).bbl
        mkdir -p dist
-       cp $(SRCS) $(PN).bbl $(BIBPATHS) $(MJOTEXPATHS) dist/
+       cp $(SRCS) $(PN).bbl dist/