13 files changed, 61 insertions, 29 deletions
diff --git a/configure b/configure
index 336614b42c..3ab224e0ef 100755
--- a/configure
+++ b/configure
@@ -909,7 +909,7 @@ sharedstatedir='${prefix}/com'
 localstatedir='${prefix}/var'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
-docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
+docdir='${datarootdir}/doc-xc/${PACKAGE_TARNAME}'
 infodir='${datarootdir}/info'
 htmldir='${docdir}'
 dvidir='${docdir}'
diff --git a/doc-xc/Makefile b/doc-xc/Makefile
index 0ec3a14cc9..8d81c14ed7 100644
--- a/doc-xc/Makefile
+++ b/doc-xc/Makefile
@@ -13,5 +13,4 @@ top_builddir = ..
 include $(top_builddir)/src/Makefile.global
 
 all distprep html man install installdirs uninstall clean distclean maintainer-clean maintainer-check:
-	$(MAKE) -C tools $@
 	$(MAKE) -C src $@
diff --git a/doc-xc/src/sgml/Makefile b/doc-xc/src/sgml/Makefile
index 234a118c9d..ea894750ae 100644
--- a/doc-xc/src/sgml/Makefile
+++ b/doc-xc/src/sgml/Makefile
@@ -21,7 +21,7 @@ subdir = doc/src/sgml
 top_builddir = ../../..
 include $(top_builddir)/src/Makefile.global
 
-MAKESGMLDIR = ../../tools/makesgml
+MAKESGMLDIR = $(top_srcdir)/src/pgxc/tools/makesgml
 MAKESGML = $(MAKESGMLDIR)/makesgml
 
 
diff --git a/src/Makefile b/src/Makefile
index 84f96c4969..4d7928395a 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -17,6 +17,7 @@ SUBDIRS = \
 	timezone \
 	gtm \
 	interfaces \
+	pgxc \
 	backend \
 	backend/utils/mb/conversion_procs \
 	backend/snowball \
@@ -25,8 +26,7 @@ SUBDIRS = \
 	bin \
 	pl \
 	makefiles \
-	test/regress \
-	pgxc/bin/pgxc_clean
+	test/regress
 
 # There are too many interdependencies between the subdirectories, so
 # don't attempt parallel make here.
diff --git a/src/bin/psql/Makefile b/src/bin/psql/Makefile
index 23f3cafd20..107f774026 100644
--- a/src/bin/psql/Makefile
+++ b/src/bin/psql/Makefile
@@ -18,8 +18,8 @@ include $(top_builddir)/src/Makefile.global
 
 REFDOCDIR= $(top_srcdir)/doc-xc/src/sgml/ref
 
-MAKESGMLDIR = $(top_srcdir)/doc-xc/tools/makesgml
-SGMLDIR= $(top_srcdir)/doc-xc/src/sgml
+MAKESGMLDIR = $(top_builddir)/src/pgxc/tools/makesgml
+SGMLDIR= $(top_builddir)/doc-xc/src/sgml
 
 override CPPFLAGS := -I. -I$(srcdir) -I$(libpq_srcdir) -I$(top_srcdir)/src/bin/pg_dump $(CPPFLAGS)
 
diff --git a/src/gtm/Makefile b/src/gtm/Makefile
index c7779db887..05a962e30d 100644
--- a/src/gtm/Makefile
+++ b/src/gtm/Makefile
@@ -33,9 +33,9 @@ distclean: clean
 maintainer-clean: distclean
 
 install: all 
-	$(INSTALL_PROGRAM) $(srcdir)/main/gtm$(X) '$(DESTDIR)$(bindir)/gtm$(X)'
-	$(INSTALL_PROGRAM) $(srcdir)/gtm_ctl/gtm_ctl$(X) '$(DESTDIR)$(bindir)/gtm_ctl$(X)'
-	$(INSTALL_PROGRAM) $(srcdir)/proxy/gtm_proxy$(X) '$(DESTDIR)$(bindir)/gtm_proxy$(X)'
+	$(INSTALL_PROGRAM) main/gtm$(X) '$(DESTDIR)$(bindir)/gtm$(X)'
+	$(INSTALL_PROGRAM) gtm_ctl/gtm_ctl$(X) '$(DESTDIR)$(bindir)/gtm_ctl$(X)'
+	$(INSTALL_PROGRAM) proxy/gtm_proxy$(X) '$(DESTDIR)$(bindir)/gtm_proxy$(X)'
 	$(INSTALL_DATA) $(srcdir)/main/gtm.conf.sample '$(DESTDIR)$(datadir)/gtm.conf.sample'
 	$(INSTALL_DATA) $(srcdir)/proxy/gtm_proxy.conf.sample '$(DESTDIR)$(datadir)/gtm_proxy.conf.sample'
 
diff --git a/src/pgxc/Makefile b/src/pgxc/Makefile
new file mode 100644
index 0000000000..a75fb5fdaa
--- /dev/null
+++ b/src/pgxc/Makefile
@@ -0,0 +1,17 @@
+#----------------------------------------------------------------------------
+#
+# Postgres-XC documentation tool makefile
+#
+# Copyright (c) 2010-2012 Nippon Telegraph and Telephone Corporation
+#
+# doc-xc/Makefile
+#
+#----------------------------------------------------------------------------
+
+subdir = src/pgxc
+top_builddir = ../..
+include $(top_builddir)/src/Makefile.global
+
+SUBDIRS = bin tools
+
+$(recurse)
diff --git a/src/pgxc/bin/Makefile b/src/pgxc/bin/Makefile
new file mode 100644
index 0000000000..3950290b42
--- /dev/null
+++ b/src/pgxc/bin/Makefile
@@ -0,0 +1,18 @@
+#----------------------------------------------------------------------------
+#
+# Postgres-XC documentation tool makefile
+#
+# Copyright (c) 2010-2012 Nippon Telegraph and Telephone Corporation
+#
+# doc-xc/Makefile
+#
+#----------------------------------------------------------------------------
+
+subdir = src/pgxc/bin
+top_builddir = ../../..
+include $(top_builddir)/src/Makefile.global
+
+SUBDIRS = pgxc_clean
+
+all distprep html man install installdirs uninstall clean distclean maintainer-clean maintainer-check:
+	$(MAKE) -C $(SUBDIRS) $@
diff --git a/src/pgxc/bin/pgxc_clean/Makefile b/src/pgxc/bin/pgxc_clean/Makefile
index 8251a04ebe..6a910c3c15 100644
--- a/src/pgxc/bin/pgxc_clean/Makefile
+++ b/src/pgxc/bin/pgxc_clean/Makefile
@@ -18,22 +18,20 @@ override CPPFLAGS := -I$(libpq_srcdir) $(CPPFLAGS)
 gtm_builddir = $(top_builddir)/src/gtm
 
 OBJS= pgxc_clean.o txninfo.o
-EX_OBJS =	$(gtm_builddir)/common/assert.o \
-			$(gtm_builddir)/client/libgtmclient.a
+EX_OBJS = $(gtm_builddir)/common/assert.o \
+	  $(gtm_builddir)/client/libgtmclient.a
 
-override LDFLAGS +=	-L$(top_builddir)/src/gtm/client \
+override LDFLAGS := -L$(top_builddir)/src/gtm/client $(LDFLAGS)
 
-# Switch when libxcm and libgtmclient are installed via 'make install'
-# LIBS= -lpthread -lxcm -lgtmclient
 LIBS= -lpthread
 
-all: pgxc_clean
-
 pgxc_clean: $(OBJS)
-	$(CC) $(CFLAGS) $(OBJS) $(EX_OBJS) $(libpq_pgport) $(LDFLAGS) $(LIBS) -o $@$(X)
+	$(CC) $(CFLAGS) $(EX_OBJS) $(OBJS) $(libpq_pgport) $(LDFLAGS) $(LIBS) -o $@$(X)
+
+all: pgxc_clean
 
 install: $(all)
-	$(INSTALL_PROGRAM) pgxc_clean$(X) '$(DESTDIR)$(bindir)'/pgxc_clean$(X)
+	$(INSTALL_PROGRAM) pgxc_clean$(X) '$(DESTDIR)$(bindir)/pgxc_clean$(X)'
 
 installdirs:
 	$(mkinstalldirs) '$(DESTDIR)$(bindir)'
@@ -42,5 +40,4 @@ uninstall:
 	rm -f $(addprefix '$(DESTDIR)$(bindir)'/, pgxc_clean$(X))
 
 clean distclean maintainer-clean:
-	rm -f pgxc_clean$(X) $(OBJS) pgxc_clean.o
-
+	rm -f pgxc_clean$(X) $(OBJS)
diff --git a/doc-xc/tools/Makefile b/src/pgxc/tools/Makefile
index 0ec957b600..21b7312337 100644
--- a/doc-xc/tools/Makefile
+++ b/src/pgxc/tools/Makefile
@@ -8,8 +8,8 @@
 #
 #----------------------------------------------------------------------------
 
-subdir = doc-xc/tools
-top_builddir = ../..
+subdir = src/pgxc/tools
+top_builddir = ../../..
 include $(top_builddir)/src/Makefile.global
 
 SUBDIRS = makesgml
diff --git a/doc-xc/tools/makesgml/Makefile b/src/pgxc/tools/makesgml/Makefile
index 011697f601..d3b50ba090 100644
--- a/doc-xc/tools/makesgml/Makefile
+++ b/src/pgxc/tools/makesgml/Makefile
@@ -11,16 +11,18 @@
 PGFILEDESC = "makesgml - convert .sgmlin to .sgml"
 PGAPPICON=win32
 
-subdir = doc-xc/tools/makesgml
-top_builddir = ../../..
+subdir = src/pgxc/tools/makesgml
+top_builddir = ../../../..
 include $(top_builddir)/src/Makefile.global
 
-OBJS = makesgml.o
+override CPPFLAGS := -I. -I$(srcdir) $(CPPFLAGS)
 
-all distprep html man: makesgml
+OBJS = makesgml.o
 
 makesgml: $(OBJS)
-	$(CC) $(CFLAGS) $(OBJS) $(LDFLAGS) $(LDFLAGS_EX) -o $@$(X)
+	$(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@$(X)
+
+all distprep html man: makesgml
 
 install: all installdirs
 	$(INSTALL_PROGRAM) makesgml$(X) '$(DESTDIR)$(bindir)/makesgml$(X)'
@@ -33,4 +35,3 @@ uninstall:
 
 clean distclean maintenance-clean maintainer-clean:
 	rm -rf makesgml$(X) $(OBJS)
-
diff --git a/doc-xc/tools/makesgml/README b/src/pgxc/tools/makesgml/README
index 2c3a8b3016..2c3a8b3016 100644
--- a/doc-xc/tools/makesgml/README
+++ b/src/pgxc/tools/makesgml/README
diff --git a/doc-xc/tools/makesgml/makesgml.c b/src/pgxc/tools/makesgml/makesgml.c
index a5f257238d..a5f257238d 100644
--- a/doc-xc/tools/makesgml/makesgml.c
+++ b/src/pgxc/tools/makesgml/makesgml.c