Move PO files into subdirectories separate from the source code.

4 files changed, 16 insertions, 36 deletions

diff --git a/src/backend/Makefile b/src/backend/Makefile
index 844fa5f6519..d0fccff9a50 100644
--- 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
index 00000000000..320d3a436ea
--- /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
index 14e4c28d15a..00000000000
--- 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
index 8797d8527d8..00000000000
--- 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