]> www.fi.muni.cz Git - evince.git/commitdiff
Update git.mk from master copy
authorChristian Persch <chpe@gnome.org>
Mon, 6 Dec 2010 21:44:17 +0000 (22:44 +0100)
committerChristian Persch <chpe@gnome.org>
Mon, 6 Dec 2010 21:45:02 +0000 (22:45 +0100)
With this updates, generated mallard .page files are ignored too.

git.mk

diff --git a/git.mk b/git.mk
index 894adb47dd67c583cfbc4328de308f60867bf054..abd6c0a28ce8715fb0e228afabec01cc9fbfe77a 100644 (file)
--- a/git.mk
+++ b/git.mk
@@ -40,7 +40,7 @@
 # build dir.
 #
 # This file knows how to handle autoconf, automake, libtool, gtk-doc,
-# gnome-doc-utils, intltool, gsettings.
+# gnome-doc-utils, mallard, intltool, gsettings.
 #
 #
 # KNOWN ISSUES:
 #   And add those files to git.  See vte/gnome-pty-helper/git.mk for
 #   example.
 #
+# ChangeLog
+#
+# - 2010-12-06 Add support for Mallard docs
+# - 2010-12-06 Start this change log
 
 git-all: git-mk-install
 
@@ -93,7 +97,7 @@ $(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk
                                xml html \
                        ; do echo /$$x; done; \
                fi; \
-               if test "x$(DOC_MODULE)" = x -o "x$(DOC_LINGUAS)" = x; then :; else \
+               if test "x$(DOC_MODULE)$(DOC_ID)" = x -o "x$(DOC_LINGUAS)" = x; then :; else \
                        for x in \
                                $(_DOC_C_DOCS) \
                                $(_DOC_LC_DOCS) \