--- psiconv/trunk/formats/Makefile.am	2001/07/28 13:13:57	135
+++ psiconv/trunk/formats/Makefile.am	2003/11/11 18:58:55	152
@@ -52,16 +52,23 @@
 EXTRA_DIST=$(GENERATE) generate_ascii.sh generate_html.sh generate_html4.sh \
            generate_rtf.sh html_links.sh index_html.sh 
 
+nobase_pkgdata_DATA=$(HTMLDOCFILES) $(HTML4DOCFILES) $(ASCIIDOCFILES) \
+	            $(RTFDOCFILES) $(PSIONFILES)
+
 all-local: .touch-html .touch-html4 .touch-ascii .touch-rtf
 
+PSIONFILES=$(GENERATE)
+
 .touch-html: $(GENERATE) 
 if HTMLDOCS
 	rm -rf html
 	mkdir html
 	./generate_html.sh .. html $(GENERATE) 
 	touch .touch-html
-endif
 
+HTMLDOCFILES=$(patsubst %.psi,%.html,$(patsubst psion/%,html/%,$(GENERATE)))
+$(HTMLDOCFILES): .touch-html
+endif
 
 .touch-html4: $(GENERATE) 
 if HTML4DOCS
@@ -69,6 +76,9 @@
 	mkdir html4
 	./generate_html4.sh .. html4 $(GENERATE)
 	touch .touch-html4
+
+HTML4DOCFILES=$(patsubst %.psi,%.html,$(patsubst psion/%,html4/%,$(GENERATE)))
+$(HTML4DOCFILES): .touch-html4
 endif
 
 .touch-ascii: $(GENERATE) 
@@ -77,6 +87,9 @@
 	mkdir ascii
 	./generate_ascii.sh .. ascii $(GENERATE) 
 	touch .touch-ascii
+
+ASCIIDOCFILES=$(patsubst %.psi,%.ascii,$(patsubst psion/%,ascii/%,$(GENERATE)))
+$(ASCIIDOCFILES): .touch-ascii
 endif
 
 .touch-rtf: $(GENERATE) 
@@ -85,6 +98,9 @@
 	mkdir rtf
 	./generate_rtf.sh .. rtf $(GENERATE) 
 	touch .touch-rtf
+
+RTFDOCFILES=$(patsubst %.psi,%.rtf,$(patsubst psion/%,rtf/%,$(GENERATE)))
+$(RTFDOCFILES): .touch-rtf
 endif
 
 clean-local: