From 59b0da27a5c6dcb898acf2a98f0c41f0e83eafa7 Mon Sep 17 00:00:00 2001
From: Kim Woelders <kim@woelders.dk>
Date: Sat, 31 Jan 2009 11:13:31 +0000
Subject: [PATCH] docdir is no good either, fix. Autofoo cleanups.

SVN revision: 38862
---
 Makefile.am      |  9 +++------
 docs/Makefile.am | 11 +++++++----
 misc/Makefile.am |  2 ++
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index b58c0fa5..7c037212 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,8 @@
 AUTOMAKE_OPTIONS = foreign
 
-MAINTAINERCLEANFILES = aclocal.m4 config.* configure depcomp \
+ACLOCAL_AMFLAGS = -I m4
+
+MAINTAINERCLEANFILES = aclocal.m4 config.* compile configure depcomp \
 		       install-sh ltmain.sh missing mkinstalldirs \
 		       Makefile.in */Makefile.in */*/Makefile.in \
 		       po/Makefile.in.in po/Makevars.template po/Rules-quot \
@@ -16,8 +18,3 @@ sample-scripts/testroller.pl \
 sample-scripts/shade-pagers.pl \
 AUTHORS COMPLIANCE COPYING ChangeLog README \
 docs/README-0.16.8
-
-ACLOCAL_AMFLAGS = -I m4
-
-changelog:
-	cvs2cl --gmt --no-hide-branch-additions --separate-header --no-indent	
diff --git a/docs/Makefile.am b/docs/Makefile.am
index 646201ff..7c43a19e 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -1,18 +1,21 @@
 if HAVE_XMLTO
 
-doc_DATA = index.html
+e16docdir = ${datadir}/doc/${PACKAGE}
+e16doc_DATA = index.html
 
 EXTRA_DIST = README-0.16.8.xml
 
+CLEANFILES = *.html
+
 index.html: README-0.16.8.xml
 	$(XMLTO) html $<
 
 install-data-local:
-	mkdir -p $(DESTDIR)$(docdir)
-	cp *.html $(DESTDIR)$(docdir)/
+	mkdir -p $(DESTDIR)$(e16docdir)
+	cp *.html $(DESTDIR)$(e16docdir)/
 
 uninstall-local:
-	rm -f $(DESTDIR)$(docdir)/*.html
+	rm -f $(DESTDIR)$(e16docdir)/*.html
 	rm -f *.html
 
 endif
diff --git a/misc/Makefile.am b/misc/Makefile.am
index fa677bff..21f12c51 100644
--- a/misc/Makefile.am
+++ b/misc/Makefile.am
@@ -17,6 +17,8 @@ xsessiondir = $(datadir)/xsessions
 
 EXTRA_DIST = $(DESKTOPS_IN) $(XCLIENTS) $(SCRIPTS) $(ICONS)
 
+CLEANFILES = $(DESKTOPS)
+
 e16.desktop: $(top_srcdir)/misc/e16.desktop.in Makefile
 e16-gnome.desktop: $(top_srcdir)/misc/e16-gnome.desktop.in Makefile
 e16-kde.desktop: $(top_srcdir)/misc/e16-kde.desktop.in Makefile