Update git.mk from pango

diff --git a/git.mk b/git.mk
index 4b742b5a076942b8bff5a8d7e9dc90e5ffbed51a..5ab41bab385708bac61d5c02d6a934e1b51da86c 100644 (file)
--- a/git.mk
+++ b/git.mk
@@ -82,7 +82,7 @@ git-mk-install:
 ### .gitignore generation
 
 $(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk
-       @echo Generating $@; \
+       $(AM_V_GEN) \
        { \
                if test "x$(DOC_MODULE)" = x -o "x$(DOC_MAIN_SGML_FILE)" = x; then :; else \
                        for x in \
@@ -115,6 +115,7 @@ $(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk
                                po/.intltool-merge-cache \
                                "po/*.gmo" \
                                "po/*.mo" \
+                               po/$(GETTEXT_PACKAGE).pot \
                                intltool-extract.in \
                                intltool-merge.in \
                                intltool-update.in \
@@ -135,6 +136,7 @@ $(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk
                        $(GITIGNOREFILES) \
                        $(CLEANFILES) \
                        $(PROGRAMS) \
+                       $(check_PROGRAMS) \
                        $(EXTRA_PROGRAMS) \
                        $(LTLIBRARIES) \
                        so_locations \
@@ -161,7 +163,7 @@ $(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk
        } | \
        sed "s@^/`echo "$(srcdir)" | sed 's/\(.\)/[\1]/g'`/@/@" | \
        sed 's@/[.]/@/@g' | \
-       LANG=C sort | uniq > $@.tmp && \
+       LC_ALL=C sort | uniq > $@.tmp && \
        mv $@.tmp $@;
 
 all: $(srcdir)/.gitignore gitignore-recurse-maybe
@@ -170,8 +172,11 @@ gitignore-recurse-maybe:
                $(MAKE) $(AM_MAKEFLAGS) gitignore-recurse; \
        fi;
 gitignore-recurse:
-       @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-         test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) .gitignore gitignore-recurse); \
+       @for subdir in $(DIST_SUBDIRS); do \
+         case " $(SUBDIRS) " in \
+           *" $$subdir "*) :;; \
+           *) test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) .gitignore gitignore-recurse || echo "Skipping $$subdir");; \
+         esac; \
        done
 gitignore: $(srcdir)/.gitignore gitignore-recurse