merge r6729-6731 from trunk

diff --git a/Makefile.am b/Makefile.am
index 6b929fa357dd5870a095fceda3c55f0ec39b23cf..9d6cc50cebb31eff56e87f01b58ba0b05c0b94d0 100644 (file)
--- 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 afca4d8d6a5c5090baa1d5119cd6948d6a60f3e6..b854b9658e191334b7d96802f091518dd809687a 100644 (file)
--- 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