intltool

Merge lp:~mordred/intltool/fix-xgettext-use into lp:intltool

  1. fix-xgettext-use
  2. Merge into trunk
Proposed by Monty Taylor
Status: Merged
Approved by: Данило Шеган
Approved revision: 715
Merged at revision: 717
Proposed branch: lp:~mordred/intltool/fix-xgettext-use
Merge into: lp:intltool
Diff against target: 13 lines (+2/-2)
1 file modified
Makefile.in.in (+2/-2)
To merge this branch: bzr merge lp:~mordred/intltool/fix-xgettext-use
Reviewer Review Type Date Requested Status
Данило Шеган Approve
Review via email: mp+30973@code.launchpad.net

Commit message

Fixed Solaris invocation of xgettext in Makefile.in.in.

Description of the change

Passed XGETTEXT along to intltool-update invocation. This way if configure has found an alternate xgettext that's more appropriate than the first one in the path (o hai Solaris) then it continues to work as expected.

To post a comment you must log in.
Revision history for this message
Данило Шеган (danilo) wrote :

Merging.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Makefile.in.in'
2--- Makefile.in.in 2009-06-27 18:39:33 +0000
3+++ Makefile.in.in 2010-07-26 17:48:52 +0000
4@@ -49,8 +49,8 @@
5 XGETTEXT = @XGETTEXT@
6 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
7 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
8-MSGMERGE = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist
9-GENPOT = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot
10+MSGMERGE = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) XGETTEXT=$(XGETTEXT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist
11+GENPOT = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) XGETTEXT=$(XGETTEXT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot
12
13 ALL_LINGUAS = @ALL_LINGUAS@
14

Subscribers

People subscribed via source and target branches