X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=doc%2Fautomake.mk;h=63972bb3e49bbc869ada2657543ad5a96e7af048;hb=2bf59c560e73f02a80ac9a9f3ecdf72a56df5862;hp=b9fe0edc903b4491908e954a5f4eb17dcdc5152e;hpb=28ca75c15c6f7795b3623d803632cfaf7b9040b1;p=pspp

diff --git a/doc/automake.mk b/doc/automake.mk
index b9fe0edc90..63972bb3e4 100644
--- a/doc/automake.mk
+++ b/doc/automake.mk
@@ -46,6 +46,7 @@ doc_pspp_TEXINFOS = doc/version.texi \
 	doc/regression.texi \
 	doc/utilities.texi \
 	doc/variables.texi \
+	doc/matrices.texi \
 	doc/fdl.texi
 
 doc_pspp_dev_TEXINFOS = doc/version-dev.texi \
@@ -61,18 +62,17 @@ doc_pspp_dev_TEXINFOS = doc/version-dev.texi \
 	doc/dev/portable-file-format.texi \
 	doc/dev/spv-file-format.texi \
 	doc/dev/tlo-file-format.texi \
-	doc/dev/encrypted-file-wrappers.texi \
-	doc/dev/q2c.texi
+	doc/dev/encrypted-file-wrappers.texi
 
 dist_man_MANS += doc/pspp.1 \
                  doc/psppire.1
 
-EXTRA_DIST += doc/get-commands.pl \
+EXTRA_DIST += doc/get-commands.py \
               doc/help-pages-list \
               doc/prepdoc.sh
 
-$(srcdir)/doc/ni.texi: $(top_srcdir)/src/language/command.def doc/get-commands.pl
-	$(AM_V_GEN)$(PERL) $(top_srcdir)/doc/get-commands.pl $(top_srcdir)/src/language/command.def > $@
+$(srcdir)/doc/ni.texi: $(top_srcdir)/src/language/command.def doc/get-commands.py
+	$(AM_V_GEN)$(PYTHON3) $(top_srcdir)/doc/get-commands.py $(top_srcdir)/src/language/command.def > $@
 
 $(srcdir)/doc/tut.texi:
 	$(AM_V_GEN)echo "@set example-dir $(examplesdir)" > $@
@@ -121,6 +121,7 @@ FIGURE_SYNTAX = \
  doc/pspp-figures/descriptives.sps \
  doc/pspp-figures/flip.sps \
  doc/pspp-figures/frequencies.sps \
+ doc/pspp-figures/matrix-print.sps \
  doc/pspp-figures/means.sps \
  doc/pspp-figures/one-sample-t.sps \
  doc/pspp-figures/independent-samples-t.sps \
@@ -190,7 +191,7 @@ pspp_output = native/utilities/pspp-output
 
 native/Makefile:
 	$(MKDIR_P) native
-	(cd native && $(top_srcdir)/configure --without-gui)
+	(cd native && $(abs_top_srcdir)/configure --host=$(build) --without-gui)
 
 native/gl/libgl.la: native/Makefile
 	(cd native && flock --verbose $(top_builddir)/native-lock $(MAKE) gl/libgl.la)
@@ -207,8 +208,8 @@ endif
 
 $(FIGURE_SPVS): $(pspp)
 .sps.spv:
-	$(AM_V_GEN)(cd $(top_srcdir)/examples \
-         && $(abs_top_builddir)/$(pspp) ../doc/pspp-figures/$(<F) -o - -O format=spv) > $@.tmp
+	$(AM_V_GEN)(cd "$(top_srcdir)/examples" \
+         && "$(abs_top_builddir)/$(pspp)" ../doc/pspp-figures/$(<F) -o - -O format=spv) > $@.tmp
 	$(AM_V_at)mv $@.tmp $@
 
 # In some cases, the tutorial only wants some parts of the output.