summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Paquier2012-05-18 21:37:03 +0000
committerMichael Paquier2012-05-18 21:45:08 +0000
commite8461c7373f1631a3549a78dfb50b181fca92aeb (patch)
treec4fae694ccb54aa4621da41fb590d707171c49e9
parent391d85e8cb7cb36ca395d79a95511c4fb2aaceae (diff)
Fix make world for vpath installation
The command makesgml, necessary to transform sgmlin files to sgml files, was not built prior to documentation build. sgml files are now ignored in doc folder.
-rw-r--r--doc-xc/src/sgml/.gitignore3
-rw-r--r--doc-xc/src/sgml/Makefile5
2 files changed, 6 insertions, 2 deletions
diff --git a/doc-xc/src/sgml/.gitignore b/doc-xc/src/sgml/.gitignore
index e1b84b490f..71258a3a23 100644
--- a/doc-xc/src/sgml/.gitignore
+++ b/doc-xc/src/sgml/.gitignore
@@ -31,3 +31,6 @@
/postgres-A4.aux
/postgres-A4.log
/postgres-A4.out
+# sgml files generated from sgmlin
+/*.sgml
+/ref/*.sgml \ No newline at end of file
diff --git a/doc-xc/src/sgml/Makefile b/doc-xc/src/sgml/Makefile
index ea894750ae..337ede7afe 100644
--- a/doc-xc/src/sgml/Makefile
+++ b/doc-xc/src/sgml/Makefile
@@ -17,11 +17,11 @@
# to want to use.
html:
-subdir = doc/src/sgml
+subdir = doc-xc/src/sgml
top_builddir = ../../..
include $(top_builddir)/src/Makefile.global
-MAKESGMLDIR = $(top_srcdir)/src/pgxc/tools/makesgml
+MAKESGMLDIR = $(top_builddir)/src/pgxc/tools/makesgml
MAKESGML = $(MAKESGMLDIR)/makesgml
@@ -215,6 +215,7 @@ INC_LIST = -I PG -I EN
#INC_LIST = -I PGXC -I EN
.sgmlin.sgml:
+ $(MAKE) -C $(MAKESGMLDIR)
$(MAKESGML) -i $< -o $@ $(INC_LIST) $(EXC_LIST)