X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=doc%2Fautomake.mk;h=3206beb25e28ad9d953a109ec0dd76987db22892;hb=ee1bfc05f5ab73883df26e616019e07a1bfee873;hp=4cc2b230ede16a93e1fcee62d407580ddf79ba76;hpb=df85c4e95a81e8ca70b60c551f15714cc8302096;p=pspp

diff --git a/doc/automake.mk b/doc/automake.mk
index 4cc2b230ed..3206beb25e 100644
--- a/doc/automake.mk
+++ b/doc/automake.mk
@@ -61,8 +61,7 @@ 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
@@ -117,6 +116,7 @@ FIGURE_SYNTAX = \
  doc/pspp-figures/chisquare.sps \
  doc/pspp-figures/compute.sps \
  doc/pspp-figures/count.sps \
+ doc/pspp-figures/crosstabs.sps \
  doc/pspp-figures/descriptives.sps \
  doc/pspp-figures/flip.sps \
  doc/pspp-figures/frequencies.sps \
@@ -189,7 +189,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)
@@ -206,8 +206,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.
@@ -295,6 +295,7 @@ $(top_srcdir)/doc/screenshots/chisquare.grab \
 $(top_srcdir)/doc/screenshots/count.grab \
 $(top_srcdir)/doc/screenshots/count-define.grab \
 $(top_srcdir)/doc/screenshots/compute.grab \
+$(top_srcdir)/doc/screenshots/crosstabs.grab \
 $(top_srcdir)/doc/screenshots/descriptives.grab \
 $(top_srcdir)/doc/screenshots/one-sample-t.grab \
 $(top_srcdir)/doc/screenshots/independent-samples-t.grab \