[glib] po/Makefile.in.in: intltool compatibility fixes

[Ryan Lortie <ryanl src gnome org>]

commit a2b350d9c3bcc979f1ce4dd6efc7ca79c07624b3
Author: Ryan Lortie <desrt desrt ca>
Date:   Sun Sep 4 21:31:13 2011 -0400

    po/Makefile.in.in: intltool compatibility fixes
    
    Our infrastructure for updating the glib20.pot file was incompatible
    with intltool in a couple of ways:
    
     - we didn't set the Report-Msgid-Bugs-To to
    
     - we used paths relative to the $(top_srcdir), rather than po/
    
    This resulted in spamming of pointless changes to the .po files whenever
    'make update-po' was run (since all of the translators are using
    intltool-based tools).

 po/Makefile.in.in |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/po/Makefile.in.in b/po/Makefile.in.in
index 4ed29e6..53b496d 100644
--- a/po/Makefile.in.in
+++ b/po/Makefile.in.in
@@ -93,7 +93,8 @@ all-yes: $(CATALOGS)
 all-no:
 
 $(srcdir)/$(GETTEXT_PACKAGE).pot: $(POTFILES)
-	$(XGETTEXT) --default-domain=$(GETTEXT_PACKAGE) --directory=$(top_srcdir) \
+	$(XGETTEXT) --default-domain=$(GETTEXT_PACKAGE) \
+	  --msgid-bugs-address='http://bugzilla.gnome.org/enter_bug.cgi?product=glib&keywords=I18N+L10N&component=general' \
 	  --add-comments --keyword=_ --keyword=N_ \
 	  --keyword=C_:1c,2 \
 	  --keyword=NC_:1c,2 \
@@ -119,7 +120,7 @@ $(srcdir)/$(GETTEXT_PACKAGE).pot: $(POTFILES)
           --flag=g_snprintf:3:c-format \
           --flag=g_scanner_error:2:c-format \
           --flag=g_scanner_warn:2:c-format \
-	  --files-from=$(srcdir)/POTFILES.in \
+	  $(POTFILES) \
 	&& test ! -f $(GETTEXT_PACKAGE).po \
 	   || ( rm -f $(srcdir)/$(GETTEXT_PACKAGE).pot \
 		&& mv $(GETTEXT_PACKAGE).po $(srcdir)/$(GETTEXT_PACKAGE).pot )