intltool

Merge lp:~dobey/intltool/relpath-pot into lp:intltool

  1. relpath-pot
  2. Merge into trunk
Proposed by dobey
Status: Merged
Approved by: dobey
Approved revision: 745
Merged at revision: 746
Proposed branch: lp:~dobey/intltool/relpath-pot
Merge into: lp:intltool
Diff against target: 20 lines (+2/-1)
1 file modified
intltool-update.in (+2/-1)
To merge this branch: bzr merge lp:~dobey/intltool/relpath-pot
Reviewer Review Type Date Requested Status
dobey (community) Approve
Review via email: mp+219450@code.launchpad.net

Commit message

Don't write $SRCDIR to the pot file.
Pass the $SRCDIR as a --directory option to xgettext.

To post a comment you must log in.
Revision history for this message
dobey (dobey) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'intltool-update.in'
2--- intltool-update.in 2011-10-08 19:24:23 +0000
3+++ intltool-update.in 2014-05-14 02:24:00 +0000
4@@ -823,7 +823,7 @@
5 }
6 else
7 {
8- print OUTFILE "$SRCDIR/../$_\n";
9+ print OUTFILE "../$_\n";
10 $gettext_code = &TextFile_DetermineEncoding ("$SRCDIR/../$_") if ($gettext_support_nonascii and not defined $forced_gettext_code);
11 }
12
13@@ -866,6 +866,7 @@
14 my @xgettext_argument=("$XGETTEXT",
15 "--add-comments",
16 "--directory\=.",
17+ "--directory\=$SRCDIR",
18 "--default-domain\=$MODULE",
19 "--flag\=g_strdup_printf:1:c-format",
20 "--flag\=g_string_printf:2:c-format",

Subscribers

People subscribed via source and target branches

to all changes: