Move PO files into subdirectories separate from the source code.

diff --git a/src/backend/Makefile b/src/backend/Makefile
index 844fa5f6519735a3aa7adca8001e64d426bd508c..d0fccff9a509b50b4f5be7eff3790c8b0bf48d38 100644 (file)
--- a/src/backend/Makefile
+++ b/src/backend/Makefile
@@ -4,7 +4,7 @@
 #
 # Copyright (c) 1994, Regents of the University of California
 #
-# $Header: /cvsroot/pgsql/src/backend/Makefile,v 1.84 2002/08/10 17:59:28 petere Exp $
+# $Header: /cvsroot/pgsql/src/backend/Makefile,v 1.85 2002/08/21 20:42:24 petere Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -31,9 +31,6 @@ endif
 
 all: submake-libpgport postgres $(POSTGRES_IMP)
    $(MAKE) -C utils/mb/conversion_procs $@
-ifeq ($(enable_nls), yes)
-   $(MAKE) -C po all
-endif
 
 ifneq ($(PORTNAME), win)
 
@@ -111,9 +108,7 @@ distprep:
    $(MAKE) -C parser   gram.c parse.h scan.c
    $(MAKE) -C bootstrap    bootparse.c bootstrap_tokens.h bootscanner.c
    $(MAKE) -C utils/misc   guc-file.c
-ifeq ($(enable_nls), yes)
-   $(MAKE) -C po $@
-endif
+
 
 ##########################################################################
 
@@ -127,9 +122,6 @@ endif
    $(INSTALL_DATA) $(srcdir)/libpq/pg_hba.conf.sample $(DESTDIR)$(datadir)/pg_hba.conf.sample
    $(INSTALL_DATA) $(srcdir)/libpq/pg_ident.conf.sample $(DESTDIR)$(datadir)/pg_ident.conf.sample
    $(INSTALL_DATA) $(srcdir)/utils/misc/postgresql.conf.sample $(DESTDIR)$(datadir)/postgresql.conf.sample
-ifeq ($(enable_nls), yes)
-   $(MAKE) -C po $@
-endif
    $(MAKE) -C utils/mb $@
    $(MAKE) -C utils/mb/conversion_procs $@
 
@@ -153,9 +145,7 @@ endif
 ifeq ($(MAKE_EXPORTS), true)
    $(mkinstalldirs) $(DESTDIR)$(pkglibdir)
 endif
-ifeq ($(enable_nls), yes)
-   $(MAKE) -C po $@
-endif
+
 
 ##########################################################################
 
@@ -173,9 +163,6 @@ endif
    rm -f $(DESTDIR)$(datadir)/pg_hba.conf.sample \
          $(DESTDIR)$(datadir)/pg_ident.conf.sample \
          $(DESTDIR)$(datadir)/postgresql.conf.sample
-ifeq ($(enable_nls), yes)
-   $(MAKE) -C po $@
-endif
 
 
 ##########################################################################
@@ -190,9 +177,6 @@ ifeq ($(MAKE_DLL), true)
 endif
 endif
    for i in $(DIRS); do $(MAKE) -C $$i clean || exit; done
-ifeq ($(enable_nls), yes)
-   $(MAKE) -C po $@
-endif
 
 distclean: clean
    rm -f port/tas.s port/dynloader.c port/pg_sema.c port/pg_shmem.c
@@ -205,7 +189,6 @@ maintainer-clean: distclean
          $(srcdir)/parser/scan.c \
          $(srcdir)/parser/parse.h \
          $(srcdir)/utils/misc/guc-file.c
-   $(MAKE) -C po maintainer-clean
 
 
 ##########################################################################

diff --git a/src/backend/nls.mk b/src/backend/nls.mk
new file mode 100644 (file)
index 0000000..320d3a4
--- /dev/null
+++ b/src/backend/nls.mk
@@ -0,0 +1,13 @@
+CATALOG_NAME   := postgres
+AVAIL_LANGUAGES    := cs de hu ru zh_CN zh_TW
+GETTEXT_FILES  := + gettext-files
+GETTEXT_TRIGGERS:= elog:2 postmaster_error yyerror
+
+gettext-files:
+   find $(srcdir)/ -name '*.c' -print >$@
+
+my-maintainer-clean:
+   rm -f gettext-files
+
+.PHONY: my-maintainer-clean
+maintainer-clean: my-maintainer-clean

diff --git a/src/backend/po/Makefile b/src/backend/po/Makefile
deleted file mode 100644 (file)
index 14e4c28..0000000
--- a/src/backend/po/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-# $Header: /cvsroot/pgsql/src/backend/po/Attic/Makefile,v 1.2 2001/09/10 22:25:48 petere Exp $
-
-subdir = src/backend/po
-top_builddir = ../../..
-include $(top_builddir)/src/Makefile.global
-
-
-gettext-files:
-   find $(srcdir)/.. -name '*.c' -print >$@
-
-maintainer-clean:
-   rm -f gettext-files

diff --git a/src/backend/po/nls.mk b/src/backend/po/nls.mk
deleted file mode 100644 (file)
index 8797d85..0000000
--- a/src/backend/po/nls.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-CATALOG_NAME   := postgres
-AVAIL_LANGUAGES    := cs de hu ru zh_CN zh_TW
-GETTEXT_FILES  := + gettext-files
-GETTEXT_TRIGGERS:= elog:2 postmaster_error yyerror

diff --git a/src/bin/pg_dump/cs.po b/src/bin/pg_dump/po/cs.po
similarity index 100%
rename from src/bin/pg_dump/cs.po
rename to src/bin/pg_dump/po/cs.po

diff --git a/src/bin/pg_dump/de.po b/src/bin/pg_dump/po/de.po
similarity index 99%
rename from src/bin/pg_dump/de.po
rename to src/bin/pg_dump/po/de.po
index 01d8f983c7fed67e0312c8f80891981711d6e7aa..921ca3e4b52455d5cf34df44c1459513903a8ae3 100644 (file)
--- a/src/bin/pg_dump/de.po
+++ b/src/bin/pg_dump/po/de.po
@@ -1,7 +1,7 @@
 # German message translation file for pg_dump and friends
 # Peter Eisentraut , 2001.
 #
-# $Header: /cvsroot/pgsql/src/bin/pg_dump/Attic/de.po,v 1.6 2002/01/29 20:39:49 petere Exp $
+# $Header: /cvsroot/pgsql/src/bin/pg_dump/po/de.po,v 1.1 2002/08/21 20:42:25 petere Exp $
 #
 # Use these quotes: »%s«
 #

diff --git a/src/bin/pg_dump/ru.po b/src/bin/pg_dump/po/ru.po
similarity index 100%
rename from src/bin/pg_dump/ru.po
rename to src/bin/pg_dump/po/ru.po

diff --git a/src/bin/pg_dump/sv.po b/src/bin/pg_dump/po/sv.po
similarity index 99%
rename from src/bin/pg_dump/sv.po
rename to src/bin/pg_dump/po/sv.po
index d0bfdc35b6fc0280e51ff8c33597ea91e0b9b83f..350da43fdf1f4c816c26781a3859dcc5c4bd300e 100644 (file)
--- a/src/bin/pg_dump/sv.po
+++ b/src/bin/pg_dump/po/sv.po
@@ -1,7 +1,7 @@
 # Swedish message translation file for pg_dump
 # Peter Eisentraut , 2001.
 #
-# $Header: /cvsroot/pgsql/src/bin/pg_dump/Attic/sv.po,v 1.1 2001/12/13 22:06:33 petere Exp $
+# $Header: /cvsroot/pgsql/src/bin/pg_dump/po/sv.po,v 1.1 2002/08/21 20:42:26 petere Exp $
 #
 # Use these quotes: "%s"
 #

diff --git a/src/bin/pg_dump/zh_CN.po b/src/bin/pg_dump/po/zh_CN.po
similarity index 99%
rename from src/bin/pg_dump/zh_CN.po
rename to src/bin/pg_dump/po/zh_CN.po
index 36a9777ea02c89154afbfb0ae142317b55603ac0..d1f06eb4cd5fae983552e1a5a4fbee0c014e9eb7 100644 (file)
--- a/src/bin/pg_dump/zh_CN.po
+++ b/src/bin/pg_dump/po/zh_CN.po
@@ -1,6 +1,6 @@
 # simplified Chinese translation file for pg_dump and friends
 # Weiping He , 2001.
-# $Header: /cvsroot/pgsql/src/bin/pg_dump/Attic/zh_CN.po,v 1.5 2001/12/10 18:45:57 petere Exp $
+# $Header: /cvsroot/pgsql/src/bin/pg_dump/po/zh_CN.po,v 1.1 2002/08/21 20:42:26 petere Exp $
 #
 msgid ""
 msgstr ""

diff --git a/src/bin/pg_dump/zh_TW.po b/src/bin/pg_dump/po/zh_TW.po
similarity index 100%
rename from src/bin/pg_dump/zh_TW.po
rename to src/bin/pg_dump/po/zh_TW.po

diff --git a/src/bin/psql/cs.po b/src/bin/psql/po/cs.po
similarity index 99%
rename from src/bin/psql/cs.po
rename to src/bin/psql/po/cs.po
index db66ce454ffc775b75f0a5c386d36116d27d8fb3..b605814e38d4b0206c3a255478073eb425e02f89 100644 (file)
--- a/src/bin/psql/cs.po
+++ b/src/bin/psql/po/cs.po
@@ -1,7 +1,7 @@
 # Czech message translation file for psql
 # Karel Zak , August 2001.
 #
-# $Header: /cvsroot/pgsql/src/bin/psql/Attic/cs.po,v 1.3 2002/06/20 20:29:42 momjian Exp $
+# $Header: /cvsroot/pgsql/src/bin/psql/po/cs.po,v 1.1 2002/08/21 20:42:26 petere Exp $
 #
 msgid ""
 msgstr ""

diff --git a/src/bin/psql/de.po b/src/bin/psql/po/de.po
similarity index 99%
rename from src/bin/psql/de.po
rename to src/bin/psql/po/de.po
index 17a5f12a36e70a7ac97474f5274ddbbab9ecd0c4..39bd6e79a3a5b5eaaa800506bc64124175e860a5 100644 (file)
--- a/src/bin/psql/de.po
+++ b/src/bin/psql/po/de.po
@@ -1,7 +1,7 @@
 # German message translation file for psql
 # Peter Eisentraut , 2001.
 #
-# $Header: /cvsroot/pgsql/src/bin/psql/Attic/de.po,v 1.6 2002/06/20 20:29:42 momjian Exp $
+# $Header: /cvsroot/pgsql/src/bin/psql/po/de.po,v 1.1 2002/08/21 20:42:26 petere Exp $
 #
 # Use these quotes: »%s«
 #

diff --git a/src/bin/psql/fr.po b/src/bin/psql/po/fr.po
similarity index 99%
rename from src/bin/psql/fr.po
rename to src/bin/psql/po/fr.po
index 4872547e5293aa26b45fec4f0b7fc49d1242648c..79e51b8a239795c452686fe4616a18912f44eaf6 100644 (file)
--- a/src/bin/psql/fr.po
+++ b/src/bin/psql/po/fr.po
@@ -1,7 +1,7 @@
 # French message translation file for psql
 # Peter Eisentraut , 2001.
 #
-# $Header: /cvsroot/pgsql/src/bin/psql/Attic/fr.po,v 1.4 2002/06/20 20:29:42 momjian Exp $
+# $Header: /cvsroot/pgsql/src/bin/psql/po/fr.po,v 1.1 2002/08/21 20:42:26 petere Exp $
 #
 # Use these quotes: «%s»
 #

diff --git a/src/bin/psql/ru.po b/src/bin/psql/po/ru.po
similarity index 99%
rename from src/bin/psql/ru.po
rename to src/bin/psql/po/ru.po
index b58085e420aae108a57ae537400be59137ff1fd5..af3392edb3ce44dbadda2ed86a9c5fe131db423a 100644 (file)
--- a/src/bin/psql/ru.po
+++ b/src/bin/psql/po/ru.po
@@ -1,7 +1,7 @@
 # PSQL Translated Messages in Russian Language (KOI8-R)
 # Serguei A. Mokhov , August-September 2001.
 #
-# $Header: /cvsroot/pgsql/src/bin/psql/Attic/ru.po,v 1.5 2002/06/20 20:29:42 momjian Exp $
+# $Header: /cvsroot/pgsql/src/bin/psql/po/Attic/ru.po,v 1.1 2002/08/21 20:42:26 petere Exp $
 #
 msgid ""
 msgstr ""

diff --git a/src/bin/psql/sv.po b/src/bin/psql/po/sv.po
similarity index 99%
rename from src/bin/psql/sv.po
rename to src/bin/psql/po/sv.po
index 81f4317571ed3ded849a9ce941ffec72d204fb7c..0ad3c65a057636c70be622af84ffb35dc0c03395 100644 (file)
--- a/src/bin/psql/sv.po
+++ b/src/bin/psql/po/sv.po
@@ -2,7 +2,7 @@
 # Peter Eisentraut , 2001.
 # Dennis Björklund , 2002.
 #
-# $Header: /cvsroot/pgsql/src/bin/psql/Attic/sv.po,v 1.4 2002/08/06 21:13:44 petere Exp $
+# $Header: /cvsroot/pgsql/src/bin/psql/po/sv.po,v 1.1 2002/08/21 20:42:26 petere Exp $
 #
 # Use these quotes: "%s"
 #

diff --git a/src/bin/psql/zh_CN.po b/src/bin/psql/po/zh_CN.po
similarity index 99%
rename from src/bin/psql/zh_CN.po
rename to src/bin/psql/po/zh_CN.po
index 0ea1bf61c38e94f9230fb3b41b55e0de9a597776..5c023548c2d65e7c1efe72bfca887e182ce84059 100644 (file)
--- a/src/bin/psql/zh_CN.po
+++ b/src/bin/psql/po/zh_CN.po
@@ -1,7 +1,7 @@
 # simplified Chinese translation file for psql
 # Weiping He , 2001.
 #
-# $Header: /cvsroot/pgsql/src/bin/psql/Attic/zh_CN.po,v 1.4 2002/06/20 20:29:42 momjian Exp $
+# $Header: /cvsroot/pgsql/src/bin/psql/po/Attic/zh_CN.po,v 1.1 2002/08/21 20:42:27 petere Exp $
 #
 msgid ""
 msgstr ""

diff --git a/src/bin/psql/zh_TW.po b/src/bin/psql/po/zh_TW.po
similarity index 100%
rename from src/bin/psql/zh_TW.po
rename to src/bin/psql/po/zh_TW.po

diff --git a/src/interfaces/libpq/cs.po b/src/interfaces/libpq/po/cs.po
similarity index 100%
rename from src/interfaces/libpq/cs.po
rename to src/interfaces/libpq/po/cs.po

diff --git a/src/interfaces/libpq/de.po b/src/interfaces/libpq/po/de.po
similarity index 99%
rename from src/interfaces/libpq/de.po
rename to src/interfaces/libpq/po/de.po
index 2455aef28c75df9661308bbf05faed405da0f2c2..0581861f2d8b6f288f551c5f44a2e032658e4306 100644 (file)
--- a/src/interfaces/libpq/de.po
+++ b/src/interfaces/libpq/po/de.po
@@ -1,7 +1,7 @@
 # German message translation file for libpq
 # Peter Eisentraut , 2001.
 #
-# $Header: /cvsroot/pgsql/src/interfaces/libpq/Attic/de.po,v 1.4 2001/11/29 18:59:28 petere Exp $
+# $Header: /cvsroot/pgsql/src/interfaces/libpq/po/de.po,v 1.1 2002/08/21 20:42:27 petere Exp $
 #
 # Use these quotes: »%s«
 #

diff --git a/src/interfaces/libpq/fr.po b/src/interfaces/libpq/po/fr.po
similarity index 99%
rename from src/interfaces/libpq/fr.po
rename to src/interfaces/libpq/po/fr.po
index 89dc70296a10ec345cd8ab86b85e103d109c9793..88070e31b6a1f0b1262243283c217f650a969ad3 100644 (file)
--- a/src/interfaces/libpq/fr.po
+++ b/src/interfaces/libpq/po/fr.po
@@ -1,7 +1,7 @@
 # French message translation file for libpq
 # Peter Eisentraut , 2001.
 #
-# $Header: /cvsroot/pgsql/src/interfaces/libpq/Attic/fr.po,v 1.2 2001/12/13 22:04:40 petere Exp $
+# $Header: /cvsroot/pgsql/src/interfaces/libpq/po/fr.po,v 1.1 2002/08/21 20:42:27 petere Exp $
 #
 # Use these quotes: «%s»
 #

diff --git a/src/interfaces/libpq/ru.po b/src/interfaces/libpq/po/ru.po
similarity index 100%
rename from src/interfaces/libpq/ru.po
rename to src/interfaces/libpq/po/ru.po

diff --git a/src/interfaces/libpq/sv.po b/src/interfaces/libpq/po/sv.po
similarity index 99%
rename from src/interfaces/libpq/sv.po
rename to src/interfaces/libpq/po/sv.po
index 0f75324c6abbe7eda3af234a6ad00fbe2da5254f..04fc7f0eac415ec711a0200a41fc839cbbad4c34 100644 (file)
--- a/src/interfaces/libpq/sv.po
+++ b/src/interfaces/libpq/po/sv.po
@@ -1,7 +1,7 @@
 # Swedish message translation file for libpq
 # Peter Eisentraut , 2001.
 #
-# $Header: /cvsroot/pgsql/src/interfaces/libpq/Attic/sv.po,v 1.1 2001/12/13 22:05:57 petere Exp $
+# $Header: /cvsroot/pgsql/src/interfaces/libpq/po/sv.po,v 1.1 2002/08/21 20:42:27 petere Exp $
 #
 # Use these quotes: "%s"
 #

diff --git a/src/interfaces/libpq/zh_CN.po b/src/interfaces/libpq/po/zh_CN.po
similarity index 99%
rename from src/interfaces/libpq/zh_CN.po
rename to src/interfaces/libpq/po/zh_CN.po
index 78c2efafc8c327cae02b819a8ce6a0a8f68b618d..e18affc94fc0444096d06615c71357be285d7fd5 100644 (file)
--- a/src/interfaces/libpq/zh_CN.po
+++ b/src/interfaces/libpq/po/zh_CN.po
@@ -1,7 +1,7 @@
 # simplified Chinese translation file for libpq
 # Weiping He , 2001
 #
-# $Header: /cvsroot/pgsql/src/interfaces/libpq/Attic/zh_CN.po,v 1.3 2001/11/29 18:59:28 petere Exp $
+# $Header: /cvsroot/pgsql/src/interfaces/libpq/po/zh_CN.po,v 1.1 2002/08/21 20:42:27 petere Exp $
 #
 msgid ""
 msgstr ""

diff --git a/src/interfaces/libpq/zh_TW.po b/src/interfaces/libpq/po/zh_TW.po
similarity index 100%
rename from src/interfaces/libpq/zh_TW.po
rename to src/interfaces/libpq/po/zh_TW.po

diff --git a/src/nls-global.mk b/src/nls-global.mk
index d78ec847aa00ee5fe8bf834439a001a2f12c1992..1576b48c07397dbd10dea6b2ac1e03f8f06ae5c5 100644 (file)
--- a/src/nls-global.mk
+++ b/src/nls-global.mk
@@ -1,4 +1,4 @@
-# $Header: /cvsroot/pgsql/src/nls-global.mk,v 1.4 2001/11/29 18:59:28 petere Exp $
+# $Header: /cvsroot/pgsql/src/nls-global.mk,v 1.5 2002/08/21 20:42:24 petere Exp $
 
 # Common rules for Native Language Support (NLS)
 #
@@ -32,8 +32,8 @@ else
 LANGUAGES = $(AVAIL_LANGUAGES)
 endif
 
-PO_FILES = $(addsuffix .po, $(LANGUAGES))
-MO_FILES = $(addsuffix .mo, $(LANGUAGES))
+PO_FILES = $(addprefix po/, $(addsuffix .po, $(LANGUAGES)))
+MO_FILES = $(addprefix po/, $(addsuffix .mo, $(LANGUAGES)))
 
 ifdef XGETTEXT
 XGETTEXT += --foreign-user -ctranslator
@@ -42,17 +42,17 @@ endif
 
 all-po: $(MO_FILES)
 
-distprep: $(srcdir)/$(CATALOG_NAME).pot
+distprep: $(srcdir)/po/$(CATALOG_NAME).pot
 
 %.mo: %.po
    $(MSGFMT) -o $@ $<
 
 ifdef XGETTEXT
 ifeq ($(word 1,$(GETTEXT_FILES)),+)
-$(srcdir)/$(CATALOG_NAME).pot: $(word 2, $(GETTEXT_FILES))
+$(srcdir)/po/$(CATALOG_NAME).pot: $(word 2, $(GETTEXT_FILES))
    $(XGETTEXT) -D $(srcdir) -n $(addprefix -k, $(GETTEXT_TRIGGERS)) -f $<
 else
-$(srcdir)/$(CATALOG_NAME).pot: $(GETTEXT_FILES)
+$(srcdir)/po/$(CATALOG_NAME).pot: $(GETTEXT_FILES)
 # Change to srcdir explicitly, don't rely on $^.  That way we get
 # consistent #: file references in the po files.
    $(XGETTEXT) -D $(srcdir) -n $(addprefix -k, $(GETTEXT_TRIGGERS)) $(GETTEXT_FILES)
@@ -65,7 +65,7 @@ endif # not XGETTEXT
 
 install-po: all-po installdirs-po
    for lang in $(LANGUAGES); do \
-     $(INSTALL_DATA) $$lang.mo $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(CATALOG_NAME).mo || exit 1; \
+     $(INSTALL_DATA) po/$$lang.mo $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(CATALOG_NAME).mo || exit 1; \
    done
 
 installdirs-po:
@@ -77,10 +77,10 @@ uninstall-po:
 
 clean-po:
    rm -f $(MO_FILES)
-   @rm -f $(addsuffix .po.old, $(AVAIL_LANGUAGES))
+   @rm -f $(addsuffix .old, $(PO_FILES))
 
 maintainer-clean-po: clean-po
-   rm -f $(srcdir)/$(CATALOG_NAME).pot
+   rm -f $(srcdir)/po/$(CATALOG_NAME).pot
 
 
 maintainer-check-po: $(PO_FILES)
@@ -89,20 +89,20 @@ maintainer-check-po: $(PO_FILES)
    done
 
 
-init-po: $(srcdir)/$(CATALOG_NAME).pot
+init-po: $(srcdir)/po/$(CATALOG_NAME).pot
 
 
-update-po: $(srcdir)/$(CATALOG_NAME).pot
+update-po: $(srcdir)/po/$(CATALOG_NAME).pot
 ifdef MSGMERGE
    @for lang in $(LANGUAGES); do \
      echo "merging $$lang:"; \
-     if $(MSGMERGE) $(srcdir)/$$lang.po $< -o $$lang.po.new; \
+     if $(MSGMERGE) $(srcdir)/po/$$lang.po $< -o po/$$lang.po.new; \
      then \
-       mv $(srcdir)/$$lang.po $$lang.po.old; \
-       mv $$lang.po.new $(srcdir)/$$lang.po; \
+       mv $(srcdir)/po/$$lang.po po/$$lang.po.old; \
+       mv po/$$lang.po.new $(srcdir)/po/$$lang.po; \
      else \
        echo "msgmerge for $$lang failed"; \
-       rm -f $$lang.po.new; \
+       rm -f po/$$lang.po.new; \
      fi; \
    done
 else
@@ -120,3 +120,4 @@ maintainer-check: maintainer-check-po
 
 .PHONY: all-po install-po installdirs-po uninstall-po clean-po \
         maintainer-clean-po maintainer-check-po init-po update-po
+.SILENT: installdirs-po