[gnome-shell] Fix srcdir != builddir issues

[Owen Taylor <otaylor src gnome org>]

commit 8dcd08f47ebaef0feb2ffb930b17a6d33421d637
Author: Owen W. Taylor <otaylor fishsoup net>
Date:   Tue Mar 8 00:33:52 2011 -0500

    Fix srcdir != builddir issues
    
    * calendar-server subdirectory of build directory needs to
      be created.
    * Generate shell-enum-types.c/.h in build directory rather than
      in the possibly-read-only source directory.

 src/Makefile-calendar-server.am |    4 +++-
 src/Makefile.am                 |   12 ++++++------
 2 files changed, 9 insertions(+), 7 deletions(-)
---
diff --git a/src/Makefile-calendar-server.am b/src/Makefile-calendar-server.am
index e617668..2172432 100644
--- a/src/Makefile-calendar-server.am
+++ b/src/Makefile-calendar-server.am
@@ -4,7 +4,9 @@ service_in_files = calendar-server/org.gnome.Shell.CalendarServer.service.in
 service_DATA     = $(service_in_files:.service.in=.service)
 
 $(service_DATA): $(service_in_files) Makefile
-	@sed -e "s|\ libexecdir\@|$(libexecdir)|" $< > $  tmp && mv $  tmp $@
+	$(AM_V_GEN)									\
+		[ -d $(@D) ] || $(mkdir_p) $(@D) ;					\
+		sed -e "s|\ libexecdir\@|$(libexecdir)|" $< > $  tmp && mv $  tmp $@
 
 libexec_PROGRAMS += gnome-shell-calendar-server
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 6e93d4e..83d5889 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -225,9 +225,9 @@ stamp-shell-enum-types.h: $(srcdir)/shell-enum-types.h.in $(shell_public_headers
 	$(AM_V_GEN) ( cd $(srcdir) && \
 	  $(GLIB_MKENUMS) \
 	    --template $< \
-	  $(shell_public_headers_h) ) > $  tmp && \
-	(cmp -s $  tmp shell-enum-types.h || mv $  tmp shell-enum-types.h) && \
-	rm -f $  tmp && \
+	  $(shell_public_headers_h) ) > $(@F).tmp && \
+	(cmp -s $(@F).tmp shell-enum-types.h || mv $(@F).tmp shell-enum-types.h) && \
+	rm -f $(@F).tmp && \
 	echo timestamp > $(@F)
 EXTRA_DIST += shell-enum-types.h.in
 CLEANFILES += stamp-shell-enum-types.h
@@ -236,9 +236,9 @@ shell-enum-types.c: shell-enum-types.c.in stamp-shell-enum-types.h
 	$(AM_V_GEN) ( cd $(srcdir) && \
 	  $(GLIB_MKENUMS) \
 	    --template $< \
-	  $(shell_public_headers_h) ) > $  tmp && \
-	mv $  tmp $@ && \
-	rm -f $  tmp
+	  $(shell_public_headers_h) ) > $(@F).tmp && \
+	mv $(@F).tmp $(@F) && \
+	rm -f $(@F).tmp
 EXTRA_DIST += shell-enum-types.c.in
 
 libgnome_shell_la_LDFLAGS = -avoid-version