[gnome-terminal] [git.mk] Support out of tree builds

[Behdad Esfahbod <behdad src gnome org>]

commit 8cd3fb167847af3053fcb6d582e665911d27eed9
Author: Behdad Esfahbod <behdad behdad org>
Date:   Sat Apr 18 16:19:37 2009 -0400

    [git.mk] Support out of tree builds
---
 Makefile.am |    5 ++++-
 git.mk      |   14 +++++++++-----
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index db58b7d..9c1d4ae 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,6 +18,10 @@ EXTRA_DIST = 			\
 	xmldocs.make		\
 	omf.make
 
+# err, INTLTOOL makes it hard to pass distcheck
+DISTCLEANFILES = \
+	$(desktop_DATA)
+
 MAINTAINERCLEANFILES = \
 	$(srcdir)/INSTALL \
 	$(srcdir)/aclocal.m4 \
@@ -36,7 +40,6 @@ MAINTAINERCLEANFILES = \
 	$(srcdir)/xmldocs.make \
 	$(srcdir)/ChangeLog \
 	$(srcdir)/gnome-doc-utils.make	\
-	$(desktop_DATA) \
 	`find "$(srcdir)" -type f -name Makefile.in -print`
 
 # hack from sound-juicer to get around scrollkeeper's leaving a big
diff --git a/git.mk b/git.mk
index 6ce5ebb..9cfce1c 100644
--- a/git.mk
+++ b/git.mk
@@ -1,8 +1,12 @@
 # git.mk
 #
-# Use as you wish.  Copyright not claimed.
+# Copyright 2009, Red Hat, Inc.
 # Written by Behdad Esfahbod
 #
+# Copying and distribution of this file, with or without modification,
+# are permitted in any medium without royalty provided the copyright
+# notice and this notice are preserved.
+#
 # The canonical source for this file is pango/git.mk, or whereever the
 # header of pango/git.mk suggests in the future.
 #
@@ -77,7 +81,7 @@ git-mk-install:
 
 ### .gitignore generation
 
-.gitignore: Makefile.am $(top_srcdir)/git.mk
+$(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk
 	@echo Generating $@; \
 	GTKDOCGITIGNOREFILES=; \
 	test "x$(DOC_MODULE)" = x -o "x$(DOC_MAIN_SGML_FILE)" = x || \
@@ -155,12 +159,12 @@ git-mk-install:
 		"*~" \
 		".*.swp" \
 	; do echo /$$x; done | \
-	grep -v '/[.][.]/' | \
+	sed "s ^/`echo "$(srcdir)" | sed 's/\(.\)/[\1]/g'`/@/@" | \
 	sed 's@/[.]/@/@g' | \
 	LANG=C sort | uniq > $  tmp && \
 	mv $  tmp $@;
 
-all: .gitignore gitignore-recurse
+all: $(srcdir)/.gitignore gitignore-recurse
 gitignore-recurse:
 	@if test "x$(SUBDIRS)" = "x$(DIST_SUBDIRS)"; then :; else \
 		list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
@@ -169,6 +173,6 @@ gitignore-recurse:
 	fi;
 maintainer-clean-local: gitignore-clean
 gitignore-clean:
-	rm -f .gitignore
+	rm -f $(srcdir)/.gitignore
 .PHONY: gitignore-clean gitignore-recurse