Split the ecpg translation support into a separate catalog for the ecpg

preprocessor and the library.  This is useful for a number of reasons:

* The preprocessor and the library are in some cases installed in separate
packages and used by different classes of users.

* The library MO files need a different versioning scheme to account for the
soname.

* The makefiles are simpler, more robust, and easier to maintain this way.
(NLS web site was prone to break everytime a build rule changes.)

* Translators might choose to focus on the ecpglib, because that is more
user-facing.

* There was virtually no overlap, so nothing is lost.

diff --git a/src/interfaces/ecpg/ecpglib/misc.c b/src/interfaces/ecpg/ecpglib/misc.c
index 914ebe7a47d989bca3da4fe26971ae738f223e00..242ab0a7d65c2eb450f253af6e6f16dd90b05c18 100644 (file)
--- a/src/interfaces/ecpg/ecpglib/misc.c
+++ b/src/interfaces/ecpg/ecpglib/misc.c
@@ -1,4 +1,4 @@
-/* $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/misc.c,v 1.46 2008/12/15 19:07:48 tgl Exp $ */
+/* $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/misc.c,v 1.47 2009/01/02 13:26:54 petere Exp $ */
 
 #define POSTGRES_ECPG_INTERNAL
 #include "postgres_fe.h"
@@ -476,7 +476,7 @@ ecpg_gettext(const char *msgid)
                ldir = getenv("PGLOCALEDIR");
                if (!ldir)
                        ldir = LOCALEDIR;
-               bindtextdomain(PG_TEXTDOMAIN("ecpg"), ldir);
+               bindtextdomain(PG_TEXTDOMAIN("ecpglib"), ldir);
 #ifdef WIN32
                SetLastError(save_errno);
 #else

diff --git a/src/interfaces/ecpg/ecpglib/nls.mk b/src/interfaces/ecpg/ecpglib/nls.mk
new file mode 100644 (file)
index 0000000..ebe2082
--- /dev/null
+++ b/src/interfaces/ecpg/ecpglib/nls.mk
@@ -0,0 +1,5 @@
+# $PostgreSQL $
+CATALOG_NAME    = ecpglib
+AVAIL_LANGUAGES         =
+GETTEXT_FILES   = ../compatlib/informix.c connect.c data.c descriptor.c error.c execute.c misc.c prepare.c
+GETTEXT_TRIGGERS = _ ecpg_gettext ecpg_log

diff --git a/src/interfaces/ecpg/nls.mk b/src/interfaces/ecpg/nls.mk
deleted file mode 100644 (file)
index 99957fd..0000000
--- a/src/interfaces/ecpg/nls.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-# $PostgreSQL $
-CATALOG_NAME   = ecpg
-AVAIL_LANGUAGES        =
-GETTEXT_FILES  = \
-       compatlib/informix.c \
-       ecpglib/connect.c \
-       ecpglib/data.c \
-       ecpglib/descriptor.c \
-       ecpglib/error.c \
-       ecpglib/execute.c \
-       ecpglib/misc.c \
-       ecpglib/prepare.c \
-       include/ecpglib.h \
-       preproc/descriptor.c \
-       preproc/ecpg.c \
-       preproc/pgc.c \
-       preproc/preproc.c \
-       preproc/type.c \
-       preproc/variable.c
-GETTEXT_TRIGGERS = _ mmerror:3 ecpg_gettext ecpg_log:1
-
-
-# Without these rules, make will invoke predefined implicit rules using "lex" 
-# and "yacc", which we don't want.  The prerequisites should be exactly the 
-# same as in preproc/Makefile.
-
-$(srcdir)/preproc/preproc.c: preproc/preproc.y
-       $(MAKE) -C preproc preproc.c
-
-$(srcdir)/preproc/pgc.c: preproc/pgc.l
-       $(MAKE) -C preproc pgc.c

diff --git a/src/interfaces/ecpg/preproc/nls.mk b/src/interfaces/ecpg/preproc/nls.mk
new file mode 100644 (file)
index 0000000..25a6277
--- /dev/null
+++ b/src/interfaces/ecpg/preproc/nls.mk
@@ -0,0 +1,5 @@
+# $PostgreSQL $
+CATALOG_NAME    = ecpg
+AVAIL_LANGUAGES         =
+GETTEXT_FILES   = descriptor.c ecpg.c pgc.c preproc.c type.c variable.c
+GETTEXT_TRIGGERS = _ mmerror:3