X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=doc%2FMakefile.am;h=f713e72b05eca20e54593774d867591aca7b29d7;hb=570ad4976cc3040d6879a89522d7116e440f7c72;hp=385cd9cf2dcd6a3935401bae2ee33783a9232fdf;hpb=6236b8750f1b39cec2e73f43711261b59a538bda;p=pazpar2-moved-to-github.git

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 385cd9c..f713e72 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,15 +1,15 @@
 # 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 local.ent
 
 MAINXML = $(srcdir)/book.xml
 
 XMLMAN = pazpar2.xml pazpar2_protocol.xml pazpar2_conf.xml
 
-SUPPORTFILES = entities.ent local.ent.in
+SUPPORTFILES = entities.ent
 
 MANFILES = pazpar2.8 pazpar2_protocol.7 pazpar2_conf.5
 
@@ -20,12 +20,14 @@ PNGFILES =
 doc_DATA = $(HTMLFILES) $(PNGFILES)
 man_MANS = $(MANFILES)
 
-EXTRA_DIST = $(XMLFILES) $(XMLMAN) $(doc_DATA) $(man_MANS)
+EXTRA_DIST = $(XMLFILES) $(XMLMAN) $(doc_DATA) $(man_MANS) $(SUPPORTFILES)
 
 $(HTMLFILES): $(XMLFILES) $(PNGFILES)
 	rm -f *.html
 	$(HTML_COMPILE) $(MAINXML)
 
+$(MANFILES): local.ent
+
 .xml.1:
 	$(MAN_COMPILE) $<
 
@@ -38,9 +40,6 @@ $(HTMLFILES): $(XMLFILES) $(PNGFILES)
 .xml.8:
 	$(MAN_COMPILE) $<
 
-index.tkl: $(XMLFILES)
-	$(TKL_COMPILE) $(MAINXML)
-
 pazpar2.pdf: $(XMLFILES)
 	rm -f pazpar2.pdf
 	$(PDF_COMPILE) $(MAINXML) && mv book.pdf pazpar2.pdf
@@ -64,10 +63,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: