From: Dana Jansens <danakj@orodu.net>
Date: Tue, 22 May 2007 05:15:42 +0000 (+0000)
Subject: merge r6739 from trunk
X-Git-Tag: openbox-3_3_991-RELEASE~1
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=3eff5bb880c4de8205371782a5e9b64aefe98b59;p=dana%2Fopenbox.git

merge r6739 from trunk
---

diff --git a/Makefile.am b/Makefile.am
index 9d6cc50c..baa62b33 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -429,7 +429,7 @@ dist_doc_DATA = \
 	data/menu.xsd \
 	doc/rc-mouse-focus.xml
 
-dist_man_MANS = \
+nodist_man_MANS = \
 	doc/openbox.1 \
 	doc/openbox-session.1 \
 	doc/openbox-gnome-session.1 \
@@ -451,6 +451,10 @@ EXTRA_DIST = \
 # make clean doesn't delete these for some reason, even though they are
 # built by make
 CLEANFILES = \
+	doc/openbox.1 \
+	doc/openbox-session.1 \
+	doc/openbox-gnome-session.1 \
+	doc/openbox-kde-session.1 \
 	data/xsession/openbox-session \
 	data/xsession/openbox-gnome-session \
 	data/xsession/openbox-kde-session \