Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit2f9d32c

Browse files
committed
Run distprep target before creating list of files that contain translatable
strings in the backend, so that .l and .y files are included. To that end,don't make the .pot file a prerequisite on distprep.
1 parent20aaf64 commit2f9d32c

File tree

2 files changed

+10
-15
lines changed

2 files changed

+10
-15
lines changed

‎src/backend/nls.mk‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
# $Header: /cvsroot/pgsql/src/backend/nls.mk,v 1.6 2003/07/28 00:25:21 tgl Exp $
1+
# $Header: /cvsroot/pgsql/src/backend/nls.mk,v 1.7 2003/09/14 22:40:38 petere Exp $
22
CATALOG_NAME:= postgres
33
AVAIL_LANGUAGES:= cs de es hr hu ru sv tr zh_CN zh_TW
44
GETTEXT_FILES:= + gettext-files
55
# you can add "elog:2" and "errmsg_internal" to this list if you want to
66
# include internal messages in the translation list.
77
GETTEXT_TRIGGERS:= errmsg errdetail errhint errcontext postmaster_error yyerror
88

9-
gettext-files:
9+
gettext-files: distprep
1010
find$(srcdir)/ -name'*.c' -print>$@
1111

1212
my-maintainer-clean:

‎src/nls-global.mk‎

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# $Header: /cvsroot/pgsql/src/nls-global.mk,v 1.7 2002/09/02 22:19:42 petere Exp $
1+
# $Header: /cvsroot/pgsql/src/nls-global.mk,v 1.8 2003/09/14 22:40:38 petere Exp $
22

33
# Common rules for Native Language Support (NLS)
44
#
@@ -42,17 +42,15 @@ endif
4242

4343
all-po:$(MO_FILES)
4444

45-
distprep:$(srcdir)/po/$(CATALOG_NAME).pot
46-
4745
%.mo:%.po
4846
$(MSGFMT) -o$@$<
4947

5048
ifdefXGETTEXT
5149
ifeq ($(word 1,$(GETTEXT_FILES)),+)
52-
$(srcdir)/po/$(CATALOG_NAME).pot:$(word 2,$(GETTEXT_FILES))
50+
po/$(CATALOG_NAME).pot:$(word 2,$(GETTEXT_FILES))
5351
$(XGETTEXT) -D$(srcdir) -n$(addprefix -k,$(GETTEXT_TRIGGERS)) -f$<
5452
else
55-
$(srcdir)/po/$(CATALOG_NAME).pot:$(GETTEXT_FILES)
53+
po/$(CATALOG_NAME).pot:$(GETTEXT_FILES)
5654
# Change to srcdir explicitly, don't rely on $^. That way we get
5755
# consistent #: file references in the po files.
5856
$(XGETTEXT) -D $(srcdir) -n $(addprefix -k, $(GETTEXT_TRIGGERS)) $(GETTEXT_FILES)
@@ -81,9 +79,7 @@ uninstall-po:
8179
clean-po:
8280
rm -f$(MO_FILES)
8381
@rm -f$(addsuffix .old,$(PO_FILES))
84-
85-
maintainer-clean-po: clean-po
86-
rm -f$(srcdir)/po/$(CATALOG_NAME).pot
82+
rm -f po/$(CATALOG_NAME).pot
8783

8884

8985
maintainer-check-po:$(PO_FILES)
@@ -92,10 +88,10 @@ maintainer-check-po: $(PO_FILES)
9288
done
9389

9490

95-
init-po:$(srcdir)/po/$(CATALOG_NAME).pot
91+
init-po: po/$(CATALOG_NAME).pot
9692

9793

98-
update-po:$(srcdir)/po/$(CATALOG_NAME).pot
94+
update-po: po/$(CATALOG_NAME).pot
9995
ifdefMSGMERGE
10096
@for lang in $(LANGUAGES); do \
10197
echo "merging $$lang:"; \
@@ -117,10 +113,9 @@ all: all-po
117113
install: install-po
118114
installdirs: installdirs-po
119115
uninstall: uninstall-po
120-
cleandistclean: clean-po
121-
maintainer-clean: maintainer-clean-po
116+
cleandistcleanmaintainer-clean: clean-po
122117
maintainer-check: maintainer-check-po
123118

124119
.PHONY: all-po install-po installdirs-po uninstall-po clean-po\
125-
maintainer-clean-po maintainer-check-po init-po update-po
120+
maintainer-check-po init-po update-po
126121
.SILENT: installdirs-po

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp