From cfe9aaeb3f25140f3f4b95f9c33f9d6f39662bf9 Mon Sep 17 00:00:00 2001
From: Dana Jansens <danakj@orodu.net>
Date: Tue, 22 May 2007 04:36:09 +0000
Subject: [PATCH] merge r6729-6731 from trunk

---
 Makefile.am  | 4 ----
 configure.ac | 6 ++++++
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 6b929fa3..9d6cc50c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -359,22 +359,18 @@ edit = $(SED) \
 
 %.desktop: %.desktop.in Makefile
 	@echo make: creating $@
-#	@mkdir data/xsession 2>/dev/null || true
 	@$(edit) $< >$@	
 
 %-session: %-session.in Makefile
 	@echo make: creating $@
-#	@mkdir data/xsession 2>/dev/null || true
 	@$(edit) $< >$@	
 
 %.1.in: %.1.sgml
 	@echo make: creating $@
-#	@mkdir doc 2>/dev/null || true
 	@docbook-to-man $< >$@
 
 %.1: %.1.in Makefile
 	@echo make: creating $@
-#	@mkdir doc 2>/dev/null || true
 	@$(edit) $< >$@	
 
 dist_gnomewmfiles_DATA = \
diff --git a/configure.ac b/configure.ac
index afca4d8d..b854b965 100644
--- a/configure.ac
+++ b/configure.ac
@@ -158,6 +158,12 @@ AC_CONFIG_FILES([
   parser/obparser-3.0.pc
   version.h
 ])
+AC_CONFIG_COMMANDS([doc],
+                   [test -d doc || mkdir doc])
+AC_CONFIG_COMMANDS([data],
+                   [test -d data || mkdir data])
+AC_CONFIG_COMMANDS([data/xsession],
+                   [test -d data/xsession || mkdir data/xsession])
 AC_OUTPUT
 
 AC_MSG_RESULT
-- 
2.34.1