summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2009-11-04 09:57:46 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2009-11-04 09:57:46 +0200
commitfccba6f6bc4c3960473423656563045dcc6c2067 (patch)
treee25510754a46ab25c22b21800cb7b57db3c2c272
parent7899564da489006f40f23c789b850b2f843de6cf (diff)
Implement more accurate doc installation
-rw-r--r--documentation/cxx/makefile2
-rw-r--r--documentation/cxx/parser/guide/makefile11
-rw-r--r--documentation/cxx/parser/makefile2
-rw-r--r--documentation/cxx/tree/guide/makefile10
-rw-r--r--documentation/cxx/tree/makefile11
-rw-r--r--documentation/cxx/tree/manual/makefile10
-rw-r--r--documentation/makefile5
7 files changed, 44 insertions, 7 deletions
diff --git a/documentation/cxx/makefile b/documentation/cxx/makefile
index 244b9b4..6d14141 100644
--- a/documentation/cxx/makefile
+++ b/documentation/cxx/makefile
@@ -8,11 +8,13 @@ include $(dir $(lastword $(MAKEFILE_LIST)))../../build/bootstrap.make
docs := parser tree
default := $(out_base)/
+install := $(out_base)/.install
dist := $(out_base)/.dist
dist-win := $(out_base)/.dist-win
cleandoc := $(out_base)/.cleandoc
$(default): $(addprefix $(out_base)/,$(addsuffix /,$(docs)))
+$(install): $(addprefix $(out_base)/,$(addsuffix /.install,$(docs)))
$(dist): $(addprefix $(out_base)/,$(addsuffix /.dist,$(docs)))
$(dist-win): $(addprefix $(out_base)/,$(addsuffix /.dist-win,$(docs)))
$(cleandoc): $(addprefix $(out_base)/,$(addsuffix /.cleandoc,$(docs)))
diff --git a/documentation/cxx/parser/guide/makefile b/documentation/cxx/parser/guide/makefile
index f1c96a6..a162057 100644
--- a/documentation/cxx/parser/guide/makefile
+++ b/documentation/cxx/parser/guide/makefile
@@ -6,6 +6,7 @@
include $(dir $(lastword $(MAKEFILE_LIST)))../../../../build/bootstrap.make
default := $(out_base)/
+install := $(out_base)/.install
dist := $(out_base)/.dist
dist-win := $(out_base)/.dist-win
cleandoc := $(out_base)/.cleandoc
@@ -23,9 +24,17 @@ $(out_base)/cxx-parser-guide.ps: $(src_base)/index.xhtml \
$(out_base)/cxx-parser-guide.pdf: $(out_base)/cxx-parser-guide.ps | $(out_base)/.
$(call message,ps2pdf $<,ps2pdf14 $< $@)
-# Dist.
+# Install & Dist.
#
+$(install): path := $(subst $(src_root)/documentation/,,$(src_base))
$(dist): path := $(subst $(src_root)/,,$(src_base))
+
+$(install): $(out_base)/cxx-parser-guide.ps $(out_base)/cxx-parser-guide.pdf
+ $(call install-data,$(src_base)/figure-1.png,$(install_doc_dir)/xsd/$(path)/figure-1.png)
+ $(call install-data,$(src_base)/index.xhtml,$(install_doc_dir)/xsd/$(path)/index.xhtml)
+ $(call install-data,$(out_base)/cxx-parser-guide.ps,$(install_doc_dir)/xsd/$(path)/cxx-parser-guide.ps)
+ $(call install-data,$(out_base)/cxx-parser-guide.pdf,$(install_doc_dir)/xsd/$(path)/cxx-parser-guide.pdf)
+
$(dist): $(out_base)/cxx-parser-guide.ps $(out_base)/cxx-parser-guide.pdf
$(call install-data,$(src_base)/figure-1.png,$(dist_prefix)/$(path)/figure-1.png)
$(call install-data,$(src_base)/index.xhtml,$(dist_prefix)/$(path)/index.xhtml)
diff --git a/documentation/cxx/parser/makefile b/documentation/cxx/parser/makefile
index 69a9557..a9e1a10 100644
--- a/documentation/cxx/parser/makefile
+++ b/documentation/cxx/parser/makefile
@@ -8,11 +8,13 @@ include $(dir $(lastword $(MAKEFILE_LIST)))../../../build/bootstrap.make
docs := guide
default := $(out_base)/
+install := $(out_base)/.install
dist := $(out_base)/.dist
dist-win := $(out_base)/.dist-win
cleandoc := $(out_base)/.cleandoc
$(default): $(addprefix $(out_base)/,$(addsuffix /,$(docs)))
+$(install): $(addprefix $(out_base)/,$(addsuffix /.install,$(docs)))
$(dist): $(addprefix $(out_base)/,$(addsuffix /.dist,$(docs)))
$(dist-win): $(addprefix $(out_base)/,$(addsuffix /.dist-win,$(docs)))
$(cleandoc): $(addprefix $(out_base)/,$(addsuffix /.cleandoc,$(docs)))
diff --git a/documentation/cxx/tree/guide/makefile b/documentation/cxx/tree/guide/makefile
index 02a6e08..300fa65 100644
--- a/documentation/cxx/tree/guide/makefile
+++ b/documentation/cxx/tree/guide/makefile
@@ -6,6 +6,7 @@
include $(dir $(lastword $(MAKEFILE_LIST)))../../../../build/bootstrap.make
default := $(out_base)/
+install := $(out_base)/.install
dist := $(out_base)/.dist
dist-win := $(out_base)/.dist-win
cleandoc := $(out_base)/.cleandoc
@@ -23,9 +24,16 @@ $(out_base)/cxx-tree-guide.ps: $(src_base)/index.xhtml \
$(out_base)/cxx-tree-guide.pdf: $(out_base)/cxx-tree-guide.ps | $(out_base)/.
$(call message,ps2pdf $<,ps2pdf14 $< $@)
-# Dist.
+# Install & Dist.
#
+$(install): path := $(subst $(src_root)/documentation/,,$(src_base))
$(dist): path := $(subst $(src_root)/,,$(src_base))
+
+$(install): $(out_base)/cxx-tree-guide.ps $(out_base)/cxx-tree-guide.pdf
+ $(call install-data,$(src_base)/index.xhtml,$(install_doc_dir)/xsd/$(path)/index.xhtml)
+ $(call install-data,$(out_base)/cxx-tree-guide.ps,$(install_doc_dir)/xsd/$(path)/cxx-tree-guide.ps)
+ $(call install-data,$(out_base)/cxx-tree-guide.pdf,$(install_doc_dir)/xsd/$(path)/cxx-tree-guide.pdf)
+
$(dist): $(out_base)/cxx-tree-guide.ps $(out_base)/cxx-tree-guide.pdf
$(call install-data,$(src_base)/index.xhtml,$(dist_prefix)/$(path)/index.xhtml)
$(call install-data,$(out_base)/cxx-tree-guide.ps,$(dist_prefix)/$(path)/cxx-tree-guide.ps)
diff --git a/documentation/cxx/tree/makefile b/documentation/cxx/tree/makefile
index 7063da8..b71a738 100644
--- a/documentation/cxx/tree/makefile
+++ b/documentation/cxx/tree/makefile
@@ -8,6 +8,7 @@ include $(dir $(lastword $(MAKEFILE_LIST)))../../../build/bootstrap.make
docs := guide manual
default := $(out_base)/
+install := $(out_base)/.install
dist := $(out_base)/.dist
dist-win := $(out_base)/.dist-win
cleandoc := $(out_base)/.cleandoc
@@ -16,11 +17,17 @@ cleandoc := $(out_base)/.cleandoc
#
$(default): $(addprefix $(out_base)/,$(addsuffix /,$(docs)))
-# Dist.
+# Install & Dist.
#
dist-common := $(out_base)/.dist-common
+$(install): path := $(subst $(src_root)/documentation/,,$(src_base))
$(dist-common): path := $(subst $(src_root)/,,$(src_base))
+
+$(install): $(addprefix $(out_base)/,$(addsuffix /.install,$(docs)))
+ $(call install-dir,$(src_base)/dbxml,$(install_doc_dir)/xsd/$(path)/dbxml)
+ $(call install-dir,$(src_base)/reference,$(install_doc_dir)/xsd/$(path)/reference)
+
$(dist-common):
$(call install-dir,$(src_base)/dbxml,$(dist_prefix)/$(path)/dbxml)
$(call install-dir,$(src_base)/reference,$(dist_prefix)/$(path)/reference)
@@ -32,4 +39,6 @@ $(dist-win): $(dist-common) $(addprefix $(out_base)/,$(addsuffix /.dist-win,$(do
#
$(cleandoc): $(addprefix $(out_base)/,$(addsuffix /.cleandoc,$(docs)))
+$(call include,$(bld_root)/install.make)
+
$(foreach m,$(docs),$(call import,$(src_base)/$m/makefile))
diff --git a/documentation/cxx/tree/manual/makefile b/documentation/cxx/tree/manual/makefile
index 0101e69..ca6e0fb 100644
--- a/documentation/cxx/tree/manual/makefile
+++ b/documentation/cxx/tree/manual/makefile
@@ -6,6 +6,7 @@
include $(dir $(lastword $(MAKEFILE_LIST)))../../../../build/bootstrap.make
default := $(out_base)/
+install := $(out_base)/.install
dist := $(out_base)/.dist
dist-win := $(out_base)/.dist-win
cleandoc := $(out_base)/.cleandoc
@@ -23,9 +24,16 @@ $(out_base)/cxx-tree-manual.ps: $(src_base)/index.xhtml \
$(out_base)/cxx-tree-manual.pdf: $(out_base)/cxx-tree-manual.ps | $(out_base)/.
$(call message,ps2pdf $<,ps2pdf14 $< $@)
-# Dist.
+# Install & Dist.
#
+$(install): path := $(subst $(src_root)/documentation/,,$(src_base))
$(dist): path := $(subst $(src_root)/,,$(src_base))
+
+$(install): $(out_base)/cxx-tree-manual.ps $(out_base)/cxx-tree-manual.pdf
+ $(call install-data,$(src_base)/index.xhtml,$(install_doc_dir)/xsd/$(path)/index.xhtml)
+ $(call install-data,$(out_base)/cxx-tree-manual.ps,$(install_doc_dir)/xsd/$(path)/cxx-tree-manual.ps)
+ $(call install-data,$(out_base)/cxx-tree-manual.pdf,$(install_doc_dir)/xsd/$(path)/cxx-tree-manual.pdf)
+
$(dist): $(out_base)/cxx-tree-manual.ps $(out_base)/cxx-tree-manual.pdf
$(call install-data,$(src_base)/index.xhtml,$(dist_prefix)/$(path)/index.xhtml)
$(call install-data,$(out_base)/cxx-tree-manual.ps,$(dist_prefix)/$(path)/cxx-tree-manual.ps)
diff --git a/documentation/makefile b/documentation/makefile
index 766587a..0638928 100644
--- a/documentation/makefile
+++ b/documentation/makefile
@@ -15,8 +15,7 @@ $(default): $(out_base)/cxx/
# Install.
#
-$(install):
- $(call install-dir,$(src_base)/cxx,$(install_doc_dir)/xsd/cxx)
+$(install): $(out_base)/cxx/.install
$(call install-data,$(src_base)/default.css,$(install_doc_dir)/xsd/default.css)
$(call install-data,$(src_base)/future.xhtml,$(install_doc_dir)/xsd/future.xhtml)
$(call install-data,$(src_base)/schema-authoring-guide.xhtml,$(install_doc_dir)/xsd/schema-authoring-guide.xhtml)
@@ -35,7 +34,7 @@ $(dist-common):
$(call install-data,$(src_base)/schema-authoring-guide.xhtml,$(dist_prefix)/documentation/schema-authoring-guide.xhtml)
$(dist): $(dist-common) $(out_base)/cxx/.dist
-$(dist-win): $(dist-common) $(out_base)/cxx/.dist
+$(dist-win): $(dist-common) $(out_base)/cxx/.dist-win
# Clean.
#