Go over Makefile and README

Author: rocky

Makefile

@@ -8,42 +8,49 @@ GIT2CL ?= admin-tools/git2cl
 PYTHON ?= python3
 PIP ?= pip3
 RM  ?= rm
-LANG ?= en
+
+# Two-letter language code, e.g. fr, zh
+lang ?= en
 
 # Size of wordlist used
 # sm=small, lg=large, md=medium.
-WORDLIST_SIZE ?=md
+WORDLIST_SIZE ?= md
+SPACY_DOWNLOAD ?= $(lang)_core_web_$(WORDLIST_SIZE)
 
 .PHONY: all build \
    check clean \
    develop dist doc doc-data \
+   pypi-setup \
    pytest \
    rmChangeLog \
    test
 
 #: Default target - same as "develop"
 all: develop
 
-#: Word-list data. Customize with LANG (and eventually WORDLIST_SIZE) variables
+#: Word-list data. Customize with lang and eventually WORDLIST_SIZE variables
 wordlist:
 	$(PYTHON) -m nltk.downloader wordnet omw
-	$(PYTHON) -m spacy download $(LANG)
-#	# $(PYTHON) -m spacy download $(LANG)_core_web_$(WORDLIST_SIZE)
+	$(PYTHON) -m spacy download $(SPACY_DOWNLOAD)
 
 #: build everything needed to install
-build:
+build: pypi-setup
 	$(PYTHON) ./setup.py build
 
-#: Set up to run from the source tree
-develop:
+#: Check Python version, and install PyPI dependencies
+pypi-setup:
 	$(PIP) install -e .
+
+#: Set up to run from the source tree
+develop: pypi-setup
 	$(MAKE) wordlist
 
 #: Install mathics
-install:
+install: pypi-setup
 	$(PYTHON) setup.py install
 
-check: pytest doctest djangotest gstest
+# Run tests
+check: pytest doctest
 
 #: Remove derived files
 clean: clean-pyc

README.rst

@@ -1,14 +1,17 @@
-Natural Language Tookkit module.
+Mathics Natural Language Tookkit module.
 
-To use this module, you will need to install nltk and spacy,
-Python modules and then install some data from English words:
+To use build module, you will need to install Python module `nltk
+<https://pypi.org/project/nltk/>`_ and `spacy
+<https://pypi.org/project/spacy/>`_, and then install some data from
+Language-specific words:
 
 ::
 
-   $ make develop
+   $ make develop  # or make install
 
-If you would like to install works for another language set the
-variable ``LANG``. For example:
+The above ``make`` command uses defaults the language to English. If
+you would like to install for another language set the variable
+``LANG``. For example:
 
 ::