summaryrefslogtreecommitdiff
path: root/git.mk
diff options
context:
space:
mode:
authorVincent Untz <vuntz@gnome.org>2009-04-27 00:26:43 +0200
committerVincent Untz <vuntz@gnome.org>2009-05-02 02:22:33 +0200
commit9d21c76a2e5d6248b40751e5fe2e6782ee498edc (patch)
tree687b34e6c985d55c8a41f87198a733dba61509ce /git.mk
parent53a7dfece6cebab2c269e3a7a01a07aad1361954 (diff)
downloadlibwnck-9d21c76a2e5d6248b40751e5fe2e6782ee498edc.tar.gz
Update git.mk from pango
Diffstat (limited to 'git.mk')
-rw-r--r--git.mk10
1 files 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