Skip to content

Commit 9e5ec3b

Browse files
committed
Change xgettext rule to run in the source tree, so we don't have the
absolute paths of the source tree in the po files. Also, run msgfmt with -c option in maintainer-check.
1 parent 6102553 commit 9e5ec3b

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

src/nls-global.mk

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# $Header: /cvsroot/pgsql/src/nls-global.mk,v 1.2 2001/06/30 21:58:06 petere Exp $
1+
# $Header: /cvsroot/pgsql/src/nls-global.mk,v 1.3 2001/07/15 11:43:55 petere Exp $
22

33
# Common rules for Native Language Support (NLS)
44
#
@@ -53,7 +53,9 @@ $(srcdir)/$(CATALOG_NAME).pot: $(word 2, $(GETTEXT_FILES))
5353
$(XGETTEXT) -D $(srcdir) -n $(addprefix -k, $(GETTEXT_TRIGGERS)) -f $<
5454
else
5555
$(srcdir)/$(CATALOG_NAME).pot: $(GETTEXT_FILES)
56-
$(XGETTEXT) -n $(addprefix -k, $(GETTEXT_TRIGGERS)) $^
56+
# Change to srcdir explicitly, don't rely on $^. That way we get
57+
# consistent #: file references in the po files.
58+
$(XGETTEXT) -D $(srcdir) -n $(addprefix -k, $(GETTEXT_TRIGGERS)) $(GETTEXT_FILES)
5759
endif
5860
mv messages.po $@
5961
else # not XGETTEXT
@@ -83,7 +85,7 @@ maintainer-clean-po: clean-po
8385

8486
maintainer-check-po: $(PO_FILES)
8587
for file in $^; do \
86-
$(MSGFMT) -v -o /dev/null $$file || exit 1; \
88+
$(MSGFMT) -c -v -o /dev/null $$file || exit 1; \
8789
done
8890

8991

0 commit comments

Comments
 (0)