]>
Commit | Line | Data |
---|---|---|
d997b14b AM |
1 | From 01c48a60e0a3bcd2e4d6829f2f0186d4ee6ef504 Mon Sep 17 00:00:00 2001 |
2 | From: Erick Tryzelaar <erickt@pixar.com> | |
3 | Date: Fri, 21 Aug 2009 12:37:18 -0700 | |
4 | Subject: [PATCH] Use LLVM's new DESTDIR-less PROJ_* variables. | |
5 | MIME-Version: 1.0 | |
6 | Content-Type: multipart/mixed; boundary="------------1.6.4" | |
7 | ||
8 | This is a multi-part message in MIME format. | |
9 | --------------1.6.4 | |
10 | Content-Type: text/plain; charset=UTF-8; format=fixed | |
11 | Content-Transfer-Encoding: 8bit | |
12 | ||
13 | --- | |
14 | docs/Makefile | 18 +++++++++--------- | |
15 | docs/tools/Makefile | 6 +++--- | |
16 | tools/clang-cc/Makefile | 2 +- | |
17 | 3 files changed, 13 insertions(+), 13 deletions(-) | |
18 | ||
19 | ||
20 | --------------1.6.4 | |
21 | Content-Type: text/x-patch; name="0001-Use-LLVM-s-new-DESTDIR-less-PROJ_-variables.patch" | |
22 | Content-Transfer-Encoding: 8bit | |
23 | Content-Disposition: attachment; filename="0001-Use-LLVM-s-new-DESTDIR-less-PROJ_-variables.patch" | |
24 | ||
25 | diff --git docs/Makefile docs/Makefile | |
26 | index 9b706c7..e9bbb28 100644 | |
27 | --- docs/Makefile | |
28 | +++ docs/Makefile | |
29 | @@ -48,11 +48,11 @@ generated:: doxygen | |
30 | ||
31 | install-html: $(PROJ_OBJ_DIR)/html.tar.gz | |
32 | $(Echo) Installing HTML documentation | |
33 | - $(Verb) $(MKDIR) $(PROJ_docsdir)/html | |
34 | - $(Verb) $(MKDIR) $(PROJ_docsdir)/html/img | |
35 | - $(Verb) $(DataInstall) $(HTML) $(PROJ_docsdir)/html | |
36 | -# $(Verb) $(DataInstall) $(IMAGES) $(PROJ_docsdir)/html/img | |
37 | - $(Verb) $(DataInstall) $(PROJ_OBJ_DIR)/html.tar.gz $(PROJ_docsdir) | |
38 | + $(Verb) $(MKDIR) $(DESTDIR)$(PROJ_docsdir)/html | |
39 | + $(Verb) $(MKDIR) $(DESTDIR)$(PROJ_docsdir)/html/img | |
40 | + $(Verb) $(DataInstall) $(HTML) $(DESTDIR)$(PROJ_docsdir)/html | |
41 | +# $(Verb) $(DataInstall) $(IMAGES) $(DESTDIR)$(PROJ_docsdir)/html/img | |
42 | + $(Verb) $(DataInstall) $(PROJ_OBJ_DIR)/html.tar.gz $(DESTDIR)$(PROJ_docsdir) | |
43 | ||
44 | $(PROJ_OBJ_DIR)/html.tar.gz: $(HTML) | |
45 | $(Echo) Packaging HTML documentation | |
46 | @@ -63,11 +63,11 @@ $(PROJ_OBJ_DIR)/html.tar.gz: $(HTML) | |
47 | ||
48 | install-doxygen: doxygen | |
49 | $(Echo) Installing doxygen documentation | |
50 | - $(Verb) $(MKDIR) $(PROJ_docsdir)/html/doxygen | |
51 | - $(Verb) $(DataInstall) $(PROJ_OBJ_DIR)/doxygen.tar.gz $(PROJ_docsdir) | |
52 | + $(Verb) $(MKDIR) $(DESTDIR)$(PROJ_docsdir)/html/doxygen | |
53 | + $(Verb) $(DataInstall) $(PROJ_OBJ_DIR)/doxygen.tar.gz $(DESTDIR)$(PROJ_docsdir) | |
54 | $(Verb) cd $(PROJ_OBJ_DIR)/doxygen && \ | |
55 | $(FIND) . -type f -exec \ | |
56 | - $(DataInstall) {} $(PROJ_docsdir)/html/doxygen \; | |
57 | + $(DataInstall) {} $(DESTDIR)$(PROJ_docsdir)/html/doxygen \; | |
58 | ||
59 | doxygen: regendoc $(PROJ_OBJ_DIR)/doxygen.tar.gz | |
60 | ||
61 | @@ -94,4 +94,4 @@ $(LLVM_SRC_ROOT)/docs/userloc.html: | |
62 | ||
63 | uninstall-local:: | |
64 | $(Echo) Uninstalling Documentation | |
65 | - $(Verb) $(RM) -rf $(PROJ_docsdir) | |
66 | + $(Verb) $(RM) -rf $(DESTDIR)$(PROJ_docsdir) | |
67 | diff --git docs/tools/Makefile docs/tools/Makefile | |
68 | index 90eb776..8107754 100644 | |
69 | --- docs/tools/Makefile | |
70 | +++ docs/tools/Makefile | |
71 | @@ -81,9 +81,9 @@ EXTRA_DIST := $(POD) | |
72 | clean-local:: | |
73 | $(Verb) $(RM) -f pod2htm*.*~~ $(HTML) $(MAN) $(PS) | |
74 | ||
75 | -HTML_DIR := $(PROJ_docsdir)/html/clang | |
76 | -MAN_DIR := $(PROJ_mandir)/man1 | |
77 | -PS_DIR := $(PROJ_docsdir)/ps | |
78 | +HTML_DIR := $(DESTDIR)$(PROJ_docsdir)/html/clang | |
79 | +MAN_DIR := $(DESTDIR)$(PROJ_mandir)/man1 | |
80 | +PS_DIR := $(DESTDIR)$(PROJ_docsdir)/ps | |
81 | ||
82 | install-html:: $(HTML) | |
83 | $(Echo) Installing HTML Clang Tools Documentation | |
84 | diff --git tools/clang-cc/Makefile tools/clang-cc/Makefile | |
85 | index 874a42f..7c31f37 100644 | |
86 | --- tools/clang-cc/Makefile | |
87 | +++ tools/clang-cc/Makefile | |
88 | @@ -27,6 +27,6 @@ USEDLIBS = clangFrontend.a clangCodeGen.a clangAnalysis.a \ | |
89 | ||
90 | # clang-cc lives in a special location; we can get away with this | |
91 | # because nothing else gets installed from here. | |
92 | -PROJ_bindir := $(DESTDIR)$(PROJ_prefix)/libexec | |
93 | +PROJ_bindir := $(PROJ_prefix)/libexec | |
94 | ||
95 | include $(LLVM_SRC_ROOT)/Makefile.rules | |
96 | ||
97 | --------------1.6.4-- | |
98 | ||
99 |