From 1c0794ea1b37f41c4e6b54f796d0c06164794011 Mon Sep 17 00:00:00 2001 From: rrt Date: Wed, 24 Oct 2001 17:15:25 +0000 Subject: [PATCH] [project @ 2001-10-24 17:15:25 by rrt] Separate installation of SGML docs and non-SGML docs. That should fix it when there are either no docs of one sort or the other, or no SGMLDocWays. --- mk/target.mk | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/mk/target.mk b/mk/target.mk index b21fbfb..611a543 100644 --- a/mk/target.mk +++ b/mk/target.mk @@ -961,21 +961,26 @@ install:: $(INSTALL_INCLUDES) done endif -ifneq "$(INSTALL_DOCS)$(INSTALL_SGML_DOC)" "" -install-docs:: $(INSTALL_DOCS) $(foreach j,$(SGMLDocWays),$(INSTALL_SGML_DOC).$j) - @$(INSTALL_DIR) $(datadir) +ifneq "$(INSTALL_DOCS)" "" +install-docs:: $(INSTALL_DOCS) + @$(INSTALL_DIR) $(datadir) for i in $(INSTALL_DOCS); do \ $(INSTALL_DATA) $(INSTALL_OPTS) $$i $(datadir); \ done - ifneq "$(SGMLDocWays)" "" \ - for i in $(SGMLDocWays); do \ - if [ $$j = "html" ]; then \ - $(CP) -r $(INSTALL_SGML_DOC) $(datadir); \ - else \ - $(INSTALL_DATA) $(INSTALL_OPTS) $(INSTALL_SGML_DOC).$$j $(datadir); \ - fi \ - done \ - fi +endif + +ifneq "$(INSTALL_SGML_DOC)" "" +ifneq "$(SGMLDocWays)" "" +install-docs:: $(foreach i,$(SGMLDocWays),$(INSTALL_SGML_DOC).$i) + @$(INSTALL_DIR) $(datadir) + for i in $(SGMLDocWays); do \ + if [ $$j = "html" ]; then \ + $(CP) -r $(INSTALL_SGML_DOC) $(datadir); \ + else \ + $(INSTALL_DATA) $(INSTALL_OPTS) $(INSTALL_SGML_DOC).$$j $(datadir); \ + fi \ + done +endif endif # -- 1.7.10.4