X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=doc%2FMakefile.am;h=7c8f0f5f5bcf1a65e7507131c3a0496a50893d08;hb=20bc8b17d60373c2c93ab6bb777d19dd92ed2960;hp=74454b624bd218d9e60c0f2f178859c967836fe9;hpb=ce78f3f5d21a07cbc03348572788899ce11e4739;p=pazpar2-moved-to-github.git

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 74454b6..7c8f0f5 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,9 +1,9 @@
 # This file is part of Pazpar2.
 SUBDIRS = common
 
-SUFFIXES=.1 .5 .7 .8 .pdf .tkl .esp .xml 
+SUFFIXES=.1 .5 .7 .8 .pdf .esp .xml 
 
-XMLFILES = book.xml manref.xml
+XMLFILES = book.xml manref.xml gpl-2.0.xml
 
 MAINXML = $(srcdir)/book.xml
 
@@ -38,12 +38,9 @@ $(HTMLFILES): $(XMLFILES) $(PNGFILES)
 .xml.8:
 	$(MAN_COMPILE) $<
 
-index.tkl: $(XMLFILES)
-	$(TKL_COMPILE) $(MAINXML)
-
 pazpar2.pdf: $(XMLFILES)
 	rm -f pazpar2.pdf
-	dblatex -P latex.class.options=a4paper,12pt,twoside,openright $(MAINXML) && mv book.pdf pazpar2.pdf
+	$(PDF_COMPILE) $(MAINXML) && mv book.pdf pazpar2.pdf
 
 jade-check: $(XMLFILES)
 	jade -E14 -D $(srcdir) -d common/print.dsl -t tex $(srcdir)/common/xml.dcl $(MAINXML)
@@ -64,10 +61,13 @@ dist-hook:
 		cp $$p $(distdir); \
 	done
 
+doc-clean:
+	rm -f manref.xml *.html *.[0-9] *.pdf
+
 install-data-hook:
 	if test -f index.html; then d=.; else d="$(srcdir)"; fi; \
 	for p in $$d/*.html; do \
-		$(docDATA_INSTALL) $$p $(DESTDIR)$(docdir); \
+		$(INSTALL_DATA) $$p $(DESTDIR)$(docdir); \
 	done
 
 uninstall-hook: