From bfc5ba2511dc5fd9f5aa9868946c8860afad81bf Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Tue, 30 Jun 2009 18:34:08 -0400
Subject: Fix "make distcheck" errors and other build cleanups.

---
 Makefile.am | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

(limited to 'Makefile.am')

diff --git a/Makefile.am b/Makefile.am
index d7c022c4ed..61c0a220a1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -32,7 +32,11 @@ EXTRA_DIST = 			\
 	$(pkgconfig_DATA:.pc=.pc.in)
 
 if ENABLE_SMIME
-SMIME_DIR=smime
+SMIME_SUBDIR=smime
+endif
+
+if WITH_HELP
+HELP_SUBDIR=help
 endif
 
 SUBDIRS = 			\
@@ -43,7 +47,7 @@ SUBDIRS = 			\
 	filter			\
 	widgets			\
 	shell			\
-	$(SMIME_DIR)		\
+	$(SMIME_SUBDIR)		\
 	em-format		\
 	composer		\
 	addressbook		\
@@ -57,11 +61,8 @@ SUBDIRS = 			\
 	views			\
 	tools			\
 	po			\
-	sounds
-
-if WITH_HELP
-SUBDIRS += help
-endif
+	sounds			\
+	$(HELP_SUBDIR)
 
 DISTCLEANFILES = 			\
 	$(builddir)/doltcompile		\
@@ -89,6 +90,7 @@ MAINTAINERCLEANFILES =			\
 DISTCHECK_CONFIGURE_FLAGS =		\
 	--enable-gtk-doc		\
 	--disable-scrollkeeper		\
-	--enable-test-component
+	--enable-test-component		\
+	--with-help
 
 -include $(top_srcdir)/git.mk
-- 
cgit v1.2.3