Make cross-building slightly more reliable

[pspp] / doc / automake.mk

diff --git a/doc/automake.mk b/doc/automake.mk
index 5efe61228bbbfac409501458be78afa7d21e0552..def0dbf395218a9aa634c7af75b648b39d130f8f 100644 (file)
--- a/doc/automake.mk
+++ b/doc/automake.mk
@@ -51,6 +51,7 @@ doc_pspp_TEXINFOS = doc/version.texi \
 doc_pspp_dev_TEXINFOS = doc/version-dev.texi \
        doc/dev/intro.texi \
        doc/dev/concepts.texi \
+       doc/dev/gui.texi \
        doc/dev/syntax.texi \
        doc/dev/data.texi \
        doc/dev/i18n.texi \
@@ -116,6 +117,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 \
@@ -188,7 +190,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)
@@ -210,7 +212,7 @@ $(FIGURE_SPVS): $(pspp)
        $(AM_V_at)mv $@.tmp $@
 
 # In some cases, the tutorial only wants some parts of the output.
-convert = $(AM_V_GEN)$(pspp_output) convert $< $@
+convert = $(AM_V_GEN)LSAN_OPTIONS="suppressions=$(abs_top_srcdir)/tests/lsan.supp:print_suppressions=0:$$LSAN_OPTIONS" $(pspp_output) convert $< $@
 doc/pspp-figures/tutorial2a.spv: doc/pspp-figures/tutorial2.spv $(pspp_output)
        $(convert) --command='Descriptives'
 doc/pspp-figures/tutorial2b.spv: doc/pspp-figures/tutorial2.spv $(pspp_output)
@@ -294,6 +296,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 \