diff --git a/config/CONFIG_COMMON b/config/CONFIG_COMMON index 7d4fc1f42..26a0879e8 100644 --- a/config/CONFIG_COMMON +++ b/config/CONFIG_COMMON @@ -25,6 +25,7 @@ INSTALL_LOCATION_BIN = $(INSTALL_LOCATION)/bin INSTALL_INCLUDE = $(INSTALL_LOCATION)/include INSTALL_DOC = $(INSTALL_LOCATION)/doc +INSTALL_HTML = $(INSTALL_LOCATION)/html INSTALL_MAN = $(INSTALL_LOCATION)/man INSTALL_TEMPLATES = $(INSTALL_LOCATION)/templates INSTALL_DBD = $(INSTALL_LOCATION)/dbd diff --git a/config/RULES.Host b/config/RULES.Host index 607187c06..c48f92d46 100644 --- a/config/RULES.Host +++ b/config/RULES.Host @@ -201,6 +201,7 @@ MANLIST = 1 2 3 4 5 6 7 8 9 INSTALL_MANS = $(foreach n, \ $(MANLIST),$(INSTALL_MAN)/man$(n) $(MAN$(n):%= $(INSTALL_MAN)/man$(n)/%)) INSTALL_DOCS = $(DOCS:%= $(INSTALL_DOC)/%) +INSTALL_HTMLS = $(HTMLS:%= $(INSTALL_HTML)/$(HTMLS_DIR)/%) INSTALL_SCRIPTS = $(SCRIPTS:%= $(INSTALL_BIN)/%) ifdef TEMPLATES_DIR INSTALL_TEMPLATES_SUBDIR = $(INSTALL_TEMPLATES)/$(TEMPLATES_DIR) @@ -262,6 +263,7 @@ buildInstall :: build $(TARGETS) $(INSTALL_LOCATION_BIN) \ $(INSTALL_BIN) $(INSTALL_SCRIPTS) $(INSTALL_PROD) \ $(INSTALL_MAN) $(INSTALL_MANS) \ $(INSTALL_DOC) $(INSTALL_DOCS) \ + $(INSTALL_HTMLS) \ $(INSTALL_TEMPLATES) $(INSTALL_TEMPLATES_SUBDIR) $(INSTALL_TEMPLATE) \ $(INSTALL_CONFIG) $(INSTALL_CONFIGS) @@ -502,6 +504,14 @@ $(INSTALL_DOC)/%: ../% @echo "Installing doc $@" @$(INSTALL) -m 644 $< $(INSTALL_DOC) +$(INSTALL_HTML)/$(HTMLS_DIR)/%: % + @echo "Installing html $@" + @$(INSTALL) -d -m 644 $< $(@D) + +$(INSTALL_HTML)/$(HTMLS_DIR)/%: ../% + @echo "Installing html $@" + @$(INSTALL) -d -m 644 $< $(@D) + $(INSTALL_TEMPLATES)/$(TEMPLATES_DIR)/%: ../% @echo "Installing $@" @$(INSTALL) -d -m 644 $< $(@D) diff --git a/config/RULES.Unix b/config/RULES.Unix index baff46e60..22ad695d5 100644 --- a/config/RULES.Unix +++ b/config/RULES.Unix @@ -9,6 +9,7 @@ MANLIST = 1 2 3 4 5 6 7 8 9 INSTALL_MANS = $(foreach n, \ $(MANLIST),$(INSTALL_MAN)/man$(n) $(MAN$(n):%= $(INSTALL_MAN)/man$(n)/%)) INSTALL_DOCS = $(DOCS:%= $(INSTALL_DOC)/%) +INSTALL_HTMLS = $(HTMLS:%= $(INSTALL_HTML)/$(HTMLS_DIR)/%) INSTALL_SCRIPTS = $(SCRIPTS:%= $(INSTALL_BIN)/%) INSTALL_TEMPLATES_SUBDIR = $(INSTALL_TEMPLATES)/$(TEMPLATES_DIR) INSTALL_TEMPLATE = $(TEMPLATES:%= $(INSTALL_TEMPLATES_SUBDIR)/%) @@ -41,7 +42,7 @@ buildInstall :: build \ $(TARGETS) \ $(INSTALL_LOCATION_BIN) $(INSTALL_BIN) \ $(INSTALL_SCRIPTS) $(INSTALL_PROD) \ - $(INSTALL_MAN) $(INSTALL_MANS) \ + $(INSTALL_MAN) $(INSTALL_MANS) $(INSTALL_HTMLS) \ $(INSTALL_DOC) $(INSTALL_DOCS) $(INSTALL_TEMPLATES) \ $(INSTALL_TEMPLATES)/$(TEMPLATES_DIR) $(INSTALL_TEMPLATE) \ $(INSTALL_CONFIG) $(INSTALL_CONFIGS) @@ -209,13 +210,21 @@ $(INSTALL_DOC)/%: ../% @echo "Installing doc $@" @$(INSTALL) -m 644 $< $(INSTALL_DOC) +$(INSTALL_HTML)/$(HTMLS_DIR)/%: % + @echo "Installing html $@" + @$(INSTALL) -d -m 644 $< $(@D) + +$(INSTALL_HTML)/$(HTMLS_DIR)/%: ../% + @echo "Installing html $@" + @$(INSTALL) -d -m 644 $< $(@D) + $(INSTALL_TEMPLATES)/$(TEMPLATES_DIR)/%: ../% @echo "Installing template $@" - @$(INSTALL) -d -m 644 $< $(INSTALL_TEMPLATES)/$(TEMPLATES_DIR) + @$(INSTALL) -d -m 644 $< $(@D) $(INSTALL_TEMPLATES)/$(TEMPLATES_DIR)/%: % @echo "Installing template $@" - @$(INSTALL) -d -m 644 $< $(INSTALL_TEMPLATES)/$(TEMPLATES_DIR) + @$(INSTALL) -d -m 644 $< $(@D) .PRECIOUS: %.o %.c diff --git a/config/RULES.Vx b/config/RULES.Vx index eb7b436f9..b4d7a2c15 100644 --- a/config/RULES.Vx +++ b/config/RULES.Vx @@ -12,6 +12,7 @@ MANLIST = 1 2 3 4 5 6 7 8 9 INSTALL_MANS = $(foreach n, \ $(MANLIST),$(INSTALL_MAN)/man$(n) $(MAN$(n):%= $(INSTALL_MAN)/man$(n)/%)) INSTALL_DOCS = $(DOCS:%= $(INSTALL_DOC)/%) +INSTALL_HTMLS = $(HTMLS:%= $(INSTALL_HTML)/$(HTMLS_DIR)/%) INSTALL_SCRIPTS = $(SCRIPTS:%= $(INSTALL_BIN)/%) INSTALL_INSTALLS = $(INSTALLS:%= $(INSTALL_BIN)/%) @@ -49,6 +50,7 @@ buildInstall :: build $(INSTALL_INCREC)\ $(TARGETS) $(INSTALL_PROD) \ $(INSTALL_MAN) $(INSTALL_MANS)\ $(INSTALL_DOC) $(INSTALL_DOCS) \ + $(INSTALL_HTMLS) \ $(INSTALL_SCRIPTS) $(INSTALL_INSTALLS)\ $(INSTALL_DBD) $(INSTALL_DBS) $(INSTALL_BPTS) \ $(INSTALL_DBDNAME) @@ -260,6 +262,14 @@ $(INSTALL_DOC)/%: ../% @echo "Installing $@" @$(INSTALL) -m 644 $< $(INSTALL_DOC) +$(INSTALL_HTML)/$(HTMLS_DIR)/%: % + @echo "Installing $@" + @$(INSTALL) -d -m 644 $< $(@D) + +$(INSTALL_HTML)/$(HTMLS_DIR)/%: ../% + @echo "Installing $@" + @$(INSTALL) -d -m 644 $< $(@D) + .PRECIOUS: %.o %.c .PHONY:: all inc depends build install pre_build clean rebuild buildInstall binInstalls