merge r6739 from trunk

diff --git a/Makefile.am b/Makefile.am
index 9d6cc50cebb31eff56e87f01b58ba0b05c0b94d0..baa62b3339aa029f7f67444b692edf81333f7bb4 100644 (file)
--- 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 \