X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=doc%2Fautomake.mk;h=75e2e7ff025145d09fb944423a4f2c7606b077cd;hb=1d447973271c2dbeedf5d5c3fad3b932038f9cec;hp=3571cc4960b116f22a75dca1fc975b618036ae74;hpb=60aae33831d7c1aefc40d4fdc73702361222f5f6;p=pspp

diff --git a/doc/automake.mk b/doc/automake.mk
index 3571cc4960..75e2e7ff02 100644
--- a/doc/automake.mk
+++ b/doc/automake.mk
@@ -92,7 +92,7 @@ dist_docbook_DATA = doc/pspp.xml
 CLEANFILES += pspp-dev.dvi $(docbook_DATA) doc/pspp.info* doc/pspp.xml
 
 
-doc: $(INFO_DEPS) $(DVIS) $(PDFS) $(PSS) $(HTMLS) $(dist_docbook_DATA)
+doc: $(INFO_DEPS) $(DVIS) $(PDFS) $(PNGS) $(HTMLS) $(dist_docbook_DATA)
 PHONY += doc
 
 doc/help-pages-list: $(UI_FILES)
@@ -150,23 +150,36 @@ FIGURE_TXTS = $(FIGURE_SPVS:.spv=.txt)
 FIGURE_TEXIS = $(FIGURE_TXTS:.txt=.texi)
 FIGURE_HTMLS = $(FIGURE_SPVS:.spv=.html)
 FIGURE_PDFS = $(FIGURE_SPVS:.spv=.pdf)
+FIGURE_PNGS = $(FIGURE_SPVS:.spv=.png)
 
 figure-spvs: $(FIGURE_SPVS)
 figure-txts: $(FIGURE_TXTS)
 figure-texis: $(FIGURE_TEXIS)
 figure-htmls: $(FIGURE_HTMLS)
 figure-pdfs: $(FIGURE_PDFS)
-PHONY += figure-spv figure-txts figure-texis figure-htmls figure-pdfs
-
-$(top_builddir)/doc/pspp.info:  $(FIGURE_TEXIS)
+figure-pngs: $(FIGURE_PNGS)
+PHONY += \
+	figure-spv \
+	figure-txts \
+	figure-texis \
+	figure-htmls \
+	figure-pdfs \
+	figure-pngs
+
+$(top_builddir)/doc/pspp.info:  $(FIGURE_PNGS)
 $(top_builddir)/doc/pspp.ps:    $(FIGURE_TEXIS)
 $(top_builddir)/doc/pspp.dvi:   $(FIGURE_TEXIS)
 $(top_builddir)/doc/pspp.html:  $(FIGURE_HTMLS)
 $(top_builddir)/doc/pspp.pdf:   $(FIGURE_TEXIS)
 $(top_builddir)/doc/pspp.xml:   $(FIGURE_TEXIS)
 
-CLEANFILES += $(FIGURE_TXTS) $(FIGURE_SPVS) $(FIGURE_TEXIS) $(FIGURE_HTMLS)
-SUFFIXES += .sps .spv .txt .html .texi .pdf
+CLEANFILES += \
+	$(FIGURE_TXTS) \
+	$(FIGURE_SPVS) \
+	$(FIGURE_TEXIS) \
+	$(FIGURE_HTMLS) \
+	$(FIGURE_PNGS)
+SUFFIXES += .sps .spv .txt .html .texi .pdf .png
 
 # Use pspp to process a syntax file into an output file.
 if cross_compiling
@@ -216,7 +229,10 @@ $(FIGURE_TXTS) $(FIGURE_HTMLS): $(pspp_output)
 .spv.txt:
 	$(convert)
 .spv.pdf:
-	$(convert) -O left-margin=0pt -O right-margin=0pt -O top-margin=0pt -O bottom-margin=0pt -O paper-size=6x20in -O font-size=12000 --table-look=$(HOME)/pspp/spss15/Looks/report.tlo
+	$(convert) -O trim=true -O left-margin=0in -O right-margin=0in -O top-margin=0in -O bottom-margin=0in -O paper-size=7.5x99in --table-look=$(srcdir)/doc/tutorial.stt
+.spv.png:
+	$(convert) -O trim=true -O left-margin=0in -O right-margin=0in -O top-margin=0in -O bottom-margin=0in -O paper-size=7.5x99in --table-look=$(srcdir)/doc/tutorial.stt
+EXTRA_DIST += doc/tutorial.stt
 .spv.html:
 	$(convert) -O format=html -O bare=true
 
@@ -227,7 +243,8 @@ $(FIGURE_TXTS) $(FIGURE_HTMLS): $(pspp_output)
 AM_MAKEINFOHTMLFLAGS = $(AM_MAKEINFOFLAGS) --css-ref=pspp-manual.css
 # Adjust the path for screenshot images.
 # But make sure these operations are idempotent.
-html-local:
+html-local: doc/pspp.html
+	test -d doc/pspp.html
 	for h in doc/pspp.html/*.html; do \
 		if grep -Fq '<img src="screenshots/' $$h; then continue; fi ; \
 		$(SED) -i -e 's|<img src="\([^"]*\)"|<img src="screenshots/\1"|' $$h; \
@@ -298,16 +315,24 @@ doc-make: doc/doc-make.in Makefile
 
 
 # Install all the PNG files so that info readers can recognise them
-install-info-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/info/
+install-info-local: $(FIGURE_PNGS)
+	$(MKDIR_P) $(DESTDIR)$(infodir)/screenshots
 	for p in $(INFO_SCREENSHOTS); do \
-		$(INSTALL_DATA) $$p $(DESTDIR)$(prefix)/share/info/ ;\
+		$(INSTALL_DATA) $$p $(DESTDIR)$(infodir)/screenshots ;\
+	done
+	$(INSTALL) -d $(DESTDIR)$(infodir)/pspp-figures
+	for p in $(FIGURE_PNGS); do \
+		$(INSTALL_DATA) $$p $(DESTDIR)$(infodir)/pspp-figures ;\
 	done
 
 uninstall-local:
 	for p in $(INFO_SCREENSHOTS); do \
 		f=`basename $$p ` ; \
-		$(RM) $(DESTDIR)$(prefix)/share/info/$$f ; \
+		rm -f $(DESTDIR)$(infodir)/screenshots/$$f ; \
+	done
+	for p in $(FIGURE_PNGS); do \
+		f=`basename $$p ` ; \
+		rm -f $(DESTDIR)$(infodir)/pspp-figures/$$f ; \
 	done
 
 EXTRA_DIST+= $(SCREENSHOTS) doc/doc-make.in doc/screengrab