From 9d21c76a2e5d6248b40751e5fe2e6782ee498edc Mon Sep 17 00:00:00 2001
From: Vincent Untz <vuntz@gnome.org>
Date: Mon, 27 Apr 2009 00:26:43 +0200
Subject: Update git.mk from pango

---
 git.mk | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/git.mk b/git.mk
index 9cfce1c..739ba92 100644
--- a/git.mk
+++ b/git.mk
@@ -28,8 +28,8 @@
 # ignore them.  See "man gitignore".
 #
 # If "make maintainer-clean" removes the files but they are not recognized
-# by this script (that is, if "git stat" shows untracked files still), send
-# me the output of "git stat" as well as your Makefile.am and Makefile for
+# by this script (that is, if "git status" shows untracked files still), send
+# me the output of "git status" as well as your Makefile.am and Makefile for
 # the directories involved.
 #
 # For a list of toplevel files that should be in MAINTAINERCLEANFILES, see
@@ -157,7 +157,7 @@ $(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk
 		"*.rej" \
 		"*.bak" \
 		"*~" \
-		".*.swp" \
+		".*.sw[nop]" \
 	; do echo /$$x; done | \
 	sed "s@^/`echo "$(srcdir)" | sed 's/\(.\)/[\1]/g'`/@/@" | \
 	sed 's@/[.]/@/@g' | \
@@ -171,8 +171,8 @@ gitignore-recurse:
 		  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) .gitignore); \
 		done; \
 	fi;
-maintainer-clean-local: gitignore-clean
+maintainer-clean: gitignore-clean
 gitignore-clean:
-	rm -f $(srcdir)/.gitignore
+	-rm -f $(srcdir)/.gitignore
 .PHONY: gitignore-clean gitignore-recurse
 
-- 
cgit v1.2.1