* Get rid of extraneous directories

* Ensure things installed to same place are all getting there by using a
  variable to name that place.
* Make sure missing index.html, images and *.css files get installed.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@18321 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/docs/CommandGuide/Makefile b/docs/CommandGuide/Makefile
index cb1f3ece6474f9926a70b8efccdb8d8ce40367da..0896c711acee6f16f4b67dec91147c065730694c 100644 (file)
--- a/docs/CommandGuide/Makefile
+++ b/docs/CommandGuide/Makefile
@@ -15,9 +15,9 @@ POD := $(wildcard $(BUILD_SRC_DIR)/*.pod)
 
 EXTRA_DIST := $(POD) index.html
 
-HTML = $(patsubst $(BUILD_SRC_DIR)/%.pod, html/%.html, $(POD))
-MAN = $(patsubst $(BUILD_SRC_DIR)/%.pod, man/man1/%.1, $(POD))
-PS = $(patsubst $(BUILD_SRC_DIR)/%.pod, ps/%.ps, $(POD))
+HTML = $(patsubst $(BUILD_SRC_DIR)/%.pod, $(BUILD_OBJ_DIR)/%.html, $(POD))
+MAN = $(patsubst $(BUILD_SRC_DIR)/%.pod, $(BUILD_OBJ_DIR)/%.1, $(POD))
+PS = $(patsubst $(BUILD_SRC_DIR)/%.pod, $(BUILD_OBJ_DIR)/%.ps, $(POD))
 
 all-local:: $(HTML) $(MAN) $(PS)
 
@@ -26,30 +26,36 @@ all-local:: $(HTML) $(MAN) $(PS)
 
 $(HTML) : html/.dir man/.dir man/man1/.dir ps/.dir
 
-html/%.html: %.pod
+$(BUILD_OBJ_DIR)/%.html: %.pod
        $(POD2HTML) --css=manpage.css --htmlroot=. --podpath=. \
          --noindex --infile=$< --outfile=$@ --title=$*
 
-man/man1/%.1: %.pod
+$(BUILD_OBJ_DIR)/%.1: %.pod
        $(POD2MAN) --release=$(PACKAGE_VERSION) \
          --center="LLVM Command Guide" $< $@
 
-ps/%.ps: man/man1/%.1
+$(BUILD_OBJ_DIR)/%.ps: man/man1/%.1
        $(GROFF) -Tps -man $< > $@
 
 clean-local::
        $(Verb) $(RM) -f pod2htm*.*~~ $(HTML) $(MAN) $(PS)
 
+HTML_DIR := $(LLVM_DOCSDIR)/html/CommandGuide
+MAN_DIR  := $(LLVM_MANDIR)/man1
+PS_DIR   := $(LLVM_DOCSDIR)/ps
+
 install-local:: $(HTML) $(MAN) $(PS)
        $(Echo) Installing HTML CommandGuide Documentation
-       $(Verb) $(INSTALL) -d $(LLVM_DOCSDIR)/html/CommandGuide
-       $(Verb) $(INSTALL) -C $(HTML) $(LLVM_DOCSDIR)/html/CommandGuide
+       $(Verb) $(INSTALL) -d $(HTML_DIR)
+       $(Verb) $(INSTALL) -C $(HTML) $(HTML_DIR)
+       $(Verb) $(INSTALL) -C $(BUILD_SRC_DIR)/index.html $(HTML_DIR)
+       $(Verb) $(INSTALL) -C $(BUILD_SRC_DIR)/manpage.css $(HTML_DIR)
        $(Echo) Installing MAN CommandGuide Documentation
-       $(Verb) $(INSTALL) -d $(LLVM_MANDIR)/man1
-       $(Verb) $(INSTALL) -C $(MAN) $(LLVM_MANDIR)/man1
+       $(Verb) $(INSTALL) -d $(MAN_DIR)
+       $(Verb) $(INSTALL) -C $(MAN) $(MAN_DIR)
        $(Echo) Installing PS CommandGuide Documentation
-       $(Verb) $(INSTALL) -d $(LLVM_DOCSDIR)/ps
-       $(Verb) $(INSTALL) -C $(PS) $(LLVM_DOCSDIR)/ps
+       $(Verb) $(INSTALL) -d $(PS_DIR)
+       $(Verb) $(INSTALL) -C $(PS) $(PS_DIR)
 
 uninstall-local::
        $(Echo) Uninstalling Documentation