--- doc/Makefile.am.orig	Fri Dec  1 19:24:39 2000
+++ doc/Makefile.am	Tue Jan 23 02:07:04 2001
@@ -2,7 +2,7 @@
 info_TEXINFOS = cfengine-Reference.texinfo cfengine-Tutorial.texinfo
 
 # Info used in building and installing HTML files
-htmldir = $(pkgdatadir)/html
+htmldir = # $(pkgdatadir)/html
 htmlfiles = cfengine-Reference.html cfengine-Tutorial.html 
 html_DATA = $(htmlfiles) cf-security.html
 
@@ -14,18 +14,19 @@
 # then uncomment the reference to ps2
 psfiles = $(ps1)	# $(ps2)
 
-psdir = $(pkgdatadir)/doc
+psdir = # $(pkgdatadir)/doc
 ps_DATA = $(psfiles)
 
 # Make sure these get distributed with everything else.
 EXTRA_DIST =								\
 	texinfo.tex							\
-	cf-security.html						\
+	$(html_DATA)							\
+	$(ps_DATA)							\
 	locks.latex							\
 	paper1.latex							\
 	paper2.latex
 
-SUFFIXES = html latex
+SUFFIXES = .html .latex
 
 %.html : %.texinfo
 	${MAKEINFO} --html $<