[packages/llvm] - removed outdated patches
qboosh
qboosh at pld-linux.org
Fri Oct 12 19:01:39 CEST 2012
commit 64de2e4b18b55cfc8277c6890621ffd0f0623c16
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Fri Oct 12 18:59:16 2012 +0200
- removed outdated patches
llvm-2.5-tclsh_check.patch | 211 -------------------------
llvm-2.6-destdir-clang.patch | 99 ------------
llvm-2.6-destdir.patch | 361 -------------------------------------------
3 files changed, 671 deletions(-)
---
diff --git a/llvm-2.5-tclsh_check.patch b/llvm-2.5-tclsh_check.patch
deleted file mode 100644
index 30d45ea..0000000
--- a/llvm-2.5-tclsh_check.patch
+++ /dev/null
@@ -1,211 +0,0 @@
-
-
-
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<!-- ViewVC :: http://www.viewvc.org/ -->
-<head>
-<title>[pkgs] View of /devel/llvm/llvm-2.5-tclsh_check.patch</title>
-<meta name="generator" content="ViewVC 1.0.9" />
-<link rel="stylesheet" href="/viewvc-static/styles.css" type="text/css" />
-
-</head>
-<body>
-<div class="vc_navheader">
-
-<form method="get" action="/viewvc/">
-
-<table style="padding:0.1em;">
-<tr>
-<td>
-<strong>
-
-<a href="/viewvc/">
-
-[pkgs]</a>
-/
-
-<a href="/viewvc/devel/">
-
-devel</a>
-/
-
-<a href="/viewvc/devel/llvm/">
-
-llvm</a>
-/
-
-<a href="/viewvc/devel/llvm/llvm-2.5-tclsh_check.patch?view=log">
-
-llvm-2.5-tclsh_check.patch</a>
-
-
-</strong>
-
-</td>
-<td style="text-align:right;">
-
-
-<strong>Repository:</strong>
-<select name="root" onchange="submit()">
-
-
-<option value="*viewroots*">Repository Listing</option>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-<optgroup label="CVS Repositories"><option>core</option><option>dirsec</option><option>docs</option><option>elvis</option><option>extras</option><option>fedora</option><option>l10n</option><option>legacy</option><option selected="selected">pkgs</option></optgroup>
-
-
-</select>
-<input type="submit" value="Go" />
-
-</td>
-</tr>
-</table>
-
-</form>
-
-</div>
-<div style="float: right; padding: 5px;"><a href="http://www.viewvc.org/"><img src="/viewvc-static/images/logo.png" alt="ViewVC logotype" width="128" height="48" /></a></div>
-<h1>View of /devel/llvm/llvm-2.5-tclsh_check.patch</h1>
-
-<p style="margin:0;">
-
-<a href="/viewvc/devel/llvm/"><img src="/viewvc-static/images/back_small.png" width="16" height="16" alt="Parent Directory" /> Parent Directory</a>
-
-| <a href="/viewvc/devel/llvm/llvm-2.5-tclsh_check.patch?view=log#rev1.1"><img src="/viewvc-static/images/log.png" width="16" height="16" alt="Revision Log" /> Revision Log</a>
-
-
-
-
-</p>
-
-<hr />
-<div class="vc_summary">
-Revision <strong>1.1</strong> -
-(<a href="/viewvc/devel/llvm/llvm-2.5-tclsh_check.patch?revision=1.1"><strong>download</strong></a>)
-
-(<a href="/viewvc/devel/llvm/llvm-2.5-tclsh_check.patch?annotate=1.1"><strong>annotate</strong></a>)
-
-<br /><em>Sun Sep 6 03:00:39 2009 UTC</em>
-(13 days, 15 hours ago)
-by <em>salimma</em>
-
-
-<br />Branch: <strong>MAIN</strong>
-
-
-<br />CVS Tags: <strong>llvm-2_5-6_fc12, llvm-2_6-0_5_pre1_fc12, llvm-2_6-0_3_pre1_fc12, llvm-2_6-0_2_pre1_fc12, llvm-2_6-0_4_pre1_fc12, llvm-2_6-0_1_pre1_fc12, HEAD</strong>
-
-
-
-
-
-
-
-
-<pre class="vc_log">Commit llvm-gcc source
-</pre>
-
-</div>
-<div id="vc_markup"><pre>--- llvm-2.5/configure.tclsh_check 2009-02-03 00:29:49.000000000 -0500
-+++ llvm-2.5/configure 2009-09-05 12:25:54.761389908 -0400
-@@ -8032,7 +8032,7 @@
- else
-
- if test x"${with_tclinclude}" != x ; then
-- if test -f ${with_tclinclude}/tclsh ; then
-+ if test -f ${with_tclinclude}/tcl.h ; then
- ac_cv_path_tclsh=`(cd ${with_tclinclude}; pwd)`
- elif test -f ${with_tclinclude}/src/tclsh ; then
- ac_cv_path_tclsh=`(cd ${with_tclinclude}/src; pwd)`
-</pre></div>
-
-<hr />
-<table>
-<tr>
-<td><address><a href="mailto:webmaster at fedoraproject.org">webmaster at fedoraproject.org</a></address></td>
-<td style="text-align: right;"><strong><a href="/viewvc-static/help_rootview.html">ViewVC Help</a></strong></td>
-</tr>
-<tr>
-<td>Powered by <a href="http://viewvc.tigris.org/">ViewVC 1.0.9</a></td>
-<td style="text-align: right;"> </td>
-</tr>
-</table>
-</body>
-</html>
-
diff --git a/llvm-2.6-destdir-clang.patch b/llvm-2.6-destdir-clang.patch
deleted file mode 100644
index 584afa5..0000000
--- a/llvm-2.6-destdir-clang.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From 01c48a60e0a3bcd2e4d6829f2f0186d4ee6ef504 Mon Sep 17 00:00:00 2001
-From: Erick Tryzelaar <erickt at pixar.com>
-Date: Fri, 21 Aug 2009 12:37:18 -0700
-Subject: [PATCH] Use LLVM's new DESTDIR-less PROJ_* variables.
-MIME-Version: 1.0
-Content-Type: multipart/mixed; boundary="------------1.6.4"
-
-This is a multi-part message in MIME format.
---------------1.6.4
-Content-Type: text/plain; charset=UTF-8; format=fixed
-Content-Transfer-Encoding: 8bit
-
----
- docs/Makefile | 18 +++++++++---------
- docs/tools/Makefile | 6 +++---
- tools/clang-cc/Makefile | 2 +-
- 3 files changed, 13 insertions(+), 13 deletions(-)
-
-
---------------1.6.4
-Content-Type: text/x-patch; name="0001-Use-LLVM-s-new-DESTDIR-less-PROJ_-variables.patch"
-Content-Transfer-Encoding: 8bit
-Content-Disposition: attachment; filename="0001-Use-LLVM-s-new-DESTDIR-less-PROJ_-variables.patch"
-
-diff --git docs/Makefile docs/Makefile
-index 9b706c7..e9bbb28 100644
---- docs/Makefile
-+++ docs/Makefile
-@@ -48,11 +48,11 @@ generated:: doxygen
-
- install-html: $(PROJ_OBJ_DIR)/html.tar.gz
- $(Echo) Installing HTML documentation
-- $(Verb) $(MKDIR) $(PROJ_docsdir)/html
-- $(Verb) $(MKDIR) $(PROJ_docsdir)/html/img
-- $(Verb) $(DataInstall) $(HTML) $(PROJ_docsdir)/html
--# $(Verb) $(DataInstall) $(IMAGES) $(PROJ_docsdir)/html/img
-- $(Verb) $(DataInstall) $(PROJ_OBJ_DIR)/html.tar.gz $(PROJ_docsdir)
-+ $(Verb) $(MKDIR) $(DESTDIR)$(PROJ_docsdir)/html
-+ $(Verb) $(MKDIR) $(DESTDIR)$(PROJ_docsdir)/html/img
-+ $(Verb) $(DataInstall) $(HTML) $(DESTDIR)$(PROJ_docsdir)/html
-+# $(Verb) $(DataInstall) $(IMAGES) $(DESTDIR)$(PROJ_docsdir)/html/img
-+ $(Verb) $(DataInstall) $(PROJ_OBJ_DIR)/html.tar.gz $(DESTDIR)$(PROJ_docsdir)
-
- $(PROJ_OBJ_DIR)/html.tar.gz: $(HTML)
- $(Echo) Packaging HTML documentation
-@@ -63,11 +63,11 @@ $(PROJ_OBJ_DIR)/html.tar.gz: $(HTML)
-
- install-doxygen: doxygen
- $(Echo) Installing doxygen documentation
-- $(Verb) $(MKDIR) $(PROJ_docsdir)/html/doxygen
-- $(Verb) $(DataInstall) $(PROJ_OBJ_DIR)/doxygen.tar.gz $(PROJ_docsdir)
-+ $(Verb) $(MKDIR) $(DESTDIR)$(PROJ_docsdir)/html/doxygen
-+ $(Verb) $(DataInstall) $(PROJ_OBJ_DIR)/doxygen.tar.gz $(DESTDIR)$(PROJ_docsdir)
- $(Verb) cd $(PROJ_OBJ_DIR)/doxygen && \
- $(FIND) . -type f -exec \
-- $(DataInstall) {} $(PROJ_docsdir)/html/doxygen \;
-+ $(DataInstall) {} $(DESTDIR)$(PROJ_docsdir)/html/doxygen \;
-
- doxygen: regendoc $(PROJ_OBJ_DIR)/doxygen.tar.gz
-
-@@ -94,4 +94,4 @@ $(LLVM_SRC_ROOT)/docs/userloc.html:
-
- uninstall-local::
- $(Echo) Uninstalling Documentation
-- $(Verb) $(RM) -rf $(PROJ_docsdir)
-+ $(Verb) $(RM) -rf $(DESTDIR)$(PROJ_docsdir)
-diff --git docs/tools/Makefile docs/tools/Makefile
-index 90eb776..8107754 100644
---- docs/tools/Makefile
-+++ docs/tools/Makefile
-@@ -81,9 +81,9 @@ EXTRA_DIST := $(POD)
- clean-local::
- $(Verb) $(RM) -f pod2htm*.*~~ $(HTML) $(MAN) $(PS)
-
--HTML_DIR := $(PROJ_docsdir)/html/clang
--MAN_DIR := $(PROJ_mandir)/man1
--PS_DIR := $(PROJ_docsdir)/ps
-+HTML_DIR := $(DESTDIR)$(PROJ_docsdir)/html/clang
-+MAN_DIR := $(DESTDIR)$(PROJ_mandir)/man1
-+PS_DIR := $(DESTDIR)$(PROJ_docsdir)/ps
-
- install-html:: $(HTML)
- $(Echo) Installing HTML Clang Tools Documentation
-diff --git tools/clang-cc/Makefile tools/clang-cc/Makefile
-index 874a42f..7c31f37 100644
---- tools/clang-cc/Makefile
-+++ tools/clang-cc/Makefile
-@@ -27,6 +27,6 @@ USEDLIBS = clangFrontend.a clangCodeGen.a clangAnalysis.a \
-
- # clang-cc lives in a special location; we can get away with this
- # because nothing else gets installed from here.
--PROJ_bindir := $(DESTDIR)$(PROJ_prefix)/libexec
-+PROJ_bindir := $(PROJ_prefix)/libexec
-
- include $(LLVM_SRC_ROOT)/Makefile.rules
-
---------------1.6.4--
-
-
diff --git a/llvm-2.6-destdir.patch b/llvm-2.6-destdir.patch
deleted file mode 100644
index f65204d..0000000
--- a/llvm-2.6-destdir.patch
+++ /dev/null
@@ -1,361 +0,0 @@
-From 5a380ce5d1c8d5a1474764a7a54a1e2072fddb03 Mon Sep 17 00:00:00 2001
-From: Erick Tryzelaar <idadesub at users.sourceforge.net>
-Date: Fri, 21 Aug 2009 11:59:01 -0700
-Subject: [PATCH] Rewrite makefiles to explicitly reference DESTDIR so we can not bake DESTDIR
- into the O'Caml symlinks.
-MIME-Version: 1.0
-Content-Type: multipart/mixed; boundary="------------1.6.4"
-
-This is a multi-part message in MIME format.
---------------1.6.4
-Content-Type: text/plain; charset=UTF-8; format=fixed
-Content-Transfer-Encoding: 8bit
-
----
- Makefile.config.in | 16 +++++++-------
- Makefile.rules | 46 ++++++++++++++++++++++----------------------
- docs/CommandGuide/Makefile | 6 ++--
- docs/Makefile | 24 +++++++++++-----------
- docs/tutorial/Makefile | 2 +-
- lib/VMCore/Makefile | 4 +-
- tools/gccas/Makefile | 4 +-
- tools/gccld/Makefile | 4 +-
- tools/llvm-config/Makefile | 4 +-
- 9 files changed, 55 insertions(+), 55 deletions(-)
-
-
---------------1.6.4
-Content-Type: text/x-patch; name="0001-Rewrite-makefiles-to-explicitly-reference-DESTDIR-so.patch"
-Content-Transfer-Encoding: 8bit
-Content-Disposition: attachment; filename="0001-Rewrite-makefiles-to-explicitly-reference-DESTDIR-so.patch"
-
-diff --git Makefile.config.in Makefile.config.in
-index ecd0595..73656f7 100644
---- Makefile.config.in
-+++ Makefile.config.in
-@@ -76,14 +76,14 @@ endif
-
- LLVMMAKE := $(LLVM_SRC_ROOT)/make
-
--PROJ_bindir := $(DESTDIR)$(PROJ_prefix)/bin
--PROJ_libdir := $(DESTDIR)$(PROJ_prefix)/lib
--PROJ_datadir := $(DESTDIR)$(PROJ_prefix)/share
--PROJ_docsdir := $(DESTDIR)$(PROJ_prefix)/docs/llvm
--PROJ_etcdir := $(DESTDIR)$(PROJ_prefix)/etc/llvm
--PROJ_includedir := $(DESTDIR)$(PROJ_prefix)/include
--PROJ_infodir := $(DESTDIR)$(PROJ_prefix)/info
--PROJ_mandir := $(DESTDIR)$(PROJ_prefix)/share/man
-+PROJ_bindir := $(PROJ_prefix)/bin
-+PROJ_libdir := $(PROJ_prefix)/lib
-+PROJ_datadir := $(PROJ_prefix)/share
-+PROJ_docsdir := $(PROJ_prefix)/docs/llvm
-+PROJ_etcdir := $(PROJ_prefix)/etc/llvm
-+PROJ_includedir := $(PROJ_prefix)/include
-+PROJ_infodir := $(PROJ_prefix)/info
-+PROJ_mandir := $(PROJ_prefix)/share/man
-
- # Determine if we're on a unix type operating system
- LLVM_ON_UNIX:=@LLVM_ON_UNIX@
-diff --git Makefile.rules Makefile.rules
-index 5556684..08965f3 100644
---- Makefile.rules
-+++ Makefile.rules
-@@ -720,7 +720,7 @@ ObjectsBC := $(BaseNameSources:%=$(ObjDir)/%.bc)
- # in the file so they get built before dependencies
- #---------------------------------------------------------
-
--$(PROJ_bindir) $(PROJ_libdir) $(PROJ_includedir) $(PROJ_etcdir)::
-+$(DESTDIR)$(PROJ_bindir) $(DESTDIR)$(PROJ_libdir) $(DESTDIR)$(PROJ_includedir) $(DESTDIR)$(PROJ_etcdir)::
- $(Verb) $(MKDIR) $@
-
- # To create other directories, as needed, and timestamp their creation
-@@ -842,22 +842,22 @@ install-local::
- uninstall-local::
- $(Echo) UnInstall circumvented with NO_INSTALL
- else
--install-local:: $(PROJ_etcdir) $(CONFIG_FILES)
-- $(Echo) Installing Configuration Files To $(PROJ_etcdir)
-+install-local:: $(DESTDIR)$(PROJ_etcdir) $(CONFIG_FILES)
-+ $(Echo) Installing Configuration Files To $(DESTDIR)$(PROJ_etcdir)
- $(Verb)for file in $(CONFIG_FILES); do \
- if test -f $(PROJ_OBJ_DIR)/$${file} ; then \
-- $(DataInstall) $(PROJ_OBJ_DIR)/$${file} $(PROJ_etcdir) ; \
-+ $(DataInstall) $(PROJ_OBJ_DIR)/$${file} $(DESTDIR)$(PROJ_etcdir) ; \
- elif test -f $(PROJ_SRC_DIR)/$${file} ; then \
-- $(DataInstall) $(PROJ_SRC_DIR)/$${file} $(PROJ_etcdir) ; \
-+ $(DataInstall) $(PROJ_SRC_DIR)/$${file} $(DESTDIR)$(PROJ_etcdir) ; \
- else \
- $(ECHO) Error: cannot find config file $${file}. ; \
- fi \
- done
-
- uninstall-local::
-- $(Echo) Uninstalling Configuration Files From $(PROJ_etcdir)
-+ $(Echo) Uninstalling Configuration Files From $(DESTDIR)$(PROJ_etcdir)
- $(Verb)for file in $(CONFIG_FILES); do \
-- $(RM) -f $(PROJ_etcdir)/$${file} ; \
-+ $(RM) -f $(DESTDIR)$(PROJ_etcdir)/$${file} ; \
- done
- endif
-
-@@ -944,7 +944,7 @@ endif
- ifdef BYTECODE_DESTINATION
- ModuleDestDir := $(BYTECODE_DESTINATION)
- else
--ModuleDestDir := $(PROJ_libdir)
-+ModuleDestDir := $(DESTDIR)$(PROJ_libdir)
- endif
-
- ifdef NO_INSTALL
-@@ -1023,17 +1023,17 @@ install-local::
- uninstall-local::
- $(Echo) Uninstall circumvented with NO_INSTALL
- else
--DestSharedLib = $(PROJ_libdir)/lib$(LIBRARYNAME)$(SHLIBEXT)
-+DestSharedLib = $(DESTDIR)$(PROJ_libdir)/lib$(LIBRARYNAME)$(SHLIBEXT)
-
- install-local:: $(DestSharedLib)
-
--$(DestSharedLib): $(LibName.SO) $(PROJ_libdir)
-+$(DestSharedLib): $(LibName.SO) $(DESTDIR)$(PROJ_libdir)
- $(Echo) Installing $(BuildMode) Shared Library $(DestSharedLib)
- $(Verb) $(INSTALL) $(LibName.SO) $(DestSharedLib)
-
- uninstall-local::
- $(Echo) Uninstalling $(BuildMode) Shared Library $(DestSharedLib)
-- -$(Verb) $(RM) -f $(PROJ_libdir)/lib$(LIBRARYNAME).*
-+ -$(Verb) $(RM) -f $(DESTDIR)$(PROJ_libdir)/lib$(LIBRARYNAME).*
- endif
- endif
-
-@@ -1078,7 +1078,7 @@ endif
- ifdef BYTECODE_DESTINATION
- BytecodeDestDir := $(BYTECODE_DESTINATION)
- else
--BytecodeDestDir := $(PROJ_libdir)
-+BytecodeDestDir := $(DESTDIR)$(PROJ_libdir)
- endif
-
- DestBytecodeLib = $(BytecodeDestDir)/lib$(LIBRARYNAME).bca
-@@ -1141,13 +1141,13 @@ install-local::
- uninstall-local::
- $(Echo) Uninstall circumvented with NO_INSTALL
- else
--DestArchiveLib := $(PROJ_libdir)/lib$(LIBRARYNAME).a
-+DestArchiveLib := $(DESTDIR)$(PROJ_libdir)/lib$(LIBRARYNAME).a
-
- install-local:: $(DestArchiveLib)
-
--$(DestArchiveLib): $(LibName.A) $(PROJ_libdir)
-+$(DestArchiveLib): $(LibName.A) $(DESTDIR)$(PROJ_libdir)
- $(Echo) Installing $(BuildMode) Archive Library $(DestArchiveLib)
-- $(Verb) $(MKDIR) $(PROJ_libdir)
-+ $(Verb) $(MKDIR) $(DESTDIR)$(PROJ_libdir)
- $(Verb) $(INSTALL) $(LibName.A) $(DestArchiveLib)
-
- uninstall-local::
-@@ -1225,11 +1225,11 @@ install-local::
- uninstall-local::
- $(Echo) Uninstall circumvented with NO_INSTALL
- else
--DestTool = $(PROJ_bindir)/$(TOOLNAME)$(EXEEXT)
-+DestTool = $(DESTDIR)$(PROJ_bindir)/$(TOOLNAME)$(EXEEXT)
-
- install-local:: $(DestTool)
-
--$(DestTool): $(ToolBuildPath) $(PROJ_bindir)
-+$(DestTool): $(ToolBuildPath) $(DESTDIR)$(PROJ_bindir)
- $(Echo) Installing $(BuildMode) $(DestTool)
- $(Verb) $(ProgInstall) $(ToolBuildPath) $(DestTool)
-
-@@ -1824,25 +1824,25 @@ uninstall-local::
- else
- install-local::
- $(Echo) Installing include files
-- $(Verb) $(MKDIR) $(PROJ_includedir)
-+ $(Verb) $(MKDIR) $(DESTDIR)$(PROJ_includedir)
- $(Verb) if test -d "$(PROJ_SRC_ROOT)/include" ; then \
- cd $(PROJ_SRC_ROOT)/include && \
- for hdr in `find . -type f '!' '(' -name '*~' \
- -o -name '.#*' -o -name '*.in' ')' -print | grep -v CVS | \
- grep -v .svn` ; do \
-- instdir=`dirname "$(PROJ_includedir)/$$hdr"` ; \
-+ instdir=`dirname "$(DESTDIR)$(PROJ_includedir)/$$hdr"` ; \
- if test \! -d "$$instdir" ; then \
- $(EchoCmd) Making install directory $$instdir ; \
- $(MKDIR) $$instdir ;\
- fi ; \
-- $(DataInstall) $$hdr $(PROJ_includedir)/$$hdr ; \
-+ $(DataInstall) $$hdr $(DESTDIR)$(PROJ_includedir)/$$hdr ; \
- done ; \
- fi
- ifneq ($(PROJ_SRC_ROOT),$(PROJ_OBJ_ROOT))
- $(Verb) if test -d "$(PROJ_OBJ_ROOT)/include" ; then \
- cd $(PROJ_OBJ_ROOT)/include && \
- for hdr in `find . -type f -print | grep -v CVS` ; do \
-- $(DataInstall) $$hdr $(PROJ_includedir)/$$hdr ; \
-+ $(DataInstall) $$hdr $(DESTDIR)$(PROJ_includedir)/$$hdr ; \
- done ; \
- fi
- endif
-@@ -1854,10 +1854,10 @@ uninstall-local::
- $(RM) -f `find . -path '*/Internal' -prune -o '(' -type f \
- '!' '(' -name '*~' -o -name '.#*' \
- -o -name '*.in' ')' -print ')' | \
-- grep -v CVS | sed 's#^#$(PROJ_includedir)/#'` ; \
-+ grep -v CVS | sed 's#^#$(DESTDIR)$(PROJ_includedir)/#'` ; \
- cd $(PROJ_SRC_ROOT)/include && \
- $(RM) -f `find . -path '*/Internal' -prune -o '(' -type f -name '*.in' \
-- -print ')' | sed 's#\.in$$##;s#^#$(PROJ_includedir)/#'` ; \
-+ -print ')' | sed 's#\.in$$##;s#^#$(DESTDIR)$(PROJ_includedir)/#'` ; \
- fi
- endif
- endif
-diff --git docs/CommandGuide/Makefile docs/CommandGuide/Makefile
-index cf77e6a..28835ac 100644
---- docs/CommandGuide/Makefile
-+++ docs/CommandGuide/Makefile
-@@ -71,9 +71,9 @@ EXTRA_DIST := $(POD) index.html
- clean-local::
- $(Verb) $(RM) -f pod2htm*.*~~ $(HTML) $(MAN) $(PS)
-
--HTML_DIR := $(PROJ_docsdir)/html/CommandGuide
--MAN_DIR := $(PROJ_mandir)/man1
--PS_DIR := $(PROJ_docsdir)/ps
-+HTML_DIR := $(DESTDIR)$(PROJ_docsdir)/html/CommandGuide
-+MAN_DIR := $(DESTDIR)$(PROJ_mandir)/man1
-+PS_DIR := $(DESTDIR)$(PROJ_docsdir)/ps
-
- install-local:: $(HTML) $(MAN) $(PS)
- $(Echo) Installing HTML CommandGuide Documentation
-diff --git docs/Makefile docs/Makefile
-index 310c4bd..30cd8a7 100644
---- docs/Makefile
-+++ docs/Makefile
-@@ -48,11 +48,11 @@ generated:: doxygen ocamldoc
-
- install-html: $(PROJ_OBJ_DIR)/html.tar.gz
- $(Echo) Installing HTML documentation
-- $(Verb) $(MKDIR) $(PROJ_docsdir)/html
-- $(Verb) $(MKDIR) $(PROJ_docsdir)/html/img
-- $(Verb) $(DataInstall) $(HTML) $(PROJ_docsdir)/html
-- $(Verb) $(DataInstall) $(IMAGES) $(PROJ_docsdir)/html/img
-- $(Verb) $(DataInstall) $(PROJ_OBJ_DIR)/html.tar.gz $(PROJ_docsdir)
-+ $(Verb) $(MKDIR) $(DESTDIR)$(PROJ_docsdir)/html
-+ $(Verb) $(MKDIR) $(DESTDIR)$(PROJ_docsdir)/html/img
-+ $(Verb) $(DataInstall) $(HTML) $(DESTDIR)$(PROJ_docsdir)/html
-+ $(Verb) $(DataInstall) $(IMAGES) $(DESTDIR)$(PROJ_docsdir)/html/img
-+ $(Verb) $(DataInstall) $(PROJ_OBJ_DIR)/html.tar.gz $(DESTDIR)$(PROJ_docsdir)
-
- $(PROJ_OBJ_DIR)/html.tar.gz: $(HTML)
- $(Echo) Packaging HTML documentation
-@@ -63,11 +63,11 @@ $(PROJ_OBJ_DIR)/html.tar.gz: $(HTML)
-
- install-doxygen: doxygen
- $(Echo) Installing doxygen documentation
-- $(Verb) $(MKDIR) $(PROJ_docsdir)/html/doxygen
-- $(Verb) $(DataInstall) $(PROJ_OBJ_DIR)/doxygen.tar.gz $(PROJ_docsdir)
-+ $(Verb) $(MKDIR) $(DESTDIR)$(PROJ_docsdir)/html/doxygen
-+ $(Verb) $(DataInstall) $(PROJ_OBJ_DIR)/doxygen.tar.gz $(DESTDIR)$(PROJ_docsdir)
- $(Verb) cd $(PROJ_OBJ_DIR)/doxygen && \
- $(FIND) . -type f -exec \
-- $(DataInstall) {} $(PROJ_docsdir)/html/doxygen \;
-+ $(DataInstall) {} $(DESTDIR)$(PROJ_docsdir)/html/doxygen \;
-
- doxygen: regendoc $(PROJ_OBJ_DIR)/doxygen.tar.gz
-
-@@ -94,11 +94,11 @@ $(LLVM_SRC_ROOT)/docs/userloc.html:
-
- install-ocamldoc: ocamldoc
- $(Echo) Installing ocamldoc documentation
-- $(Verb) $(MKDIR) $(PROJ_docsdir)/ocamldoc/html
-- $(Verb) $(DataInstall) $(PROJ_OBJ_DIR)/ocamldoc.tar.gz $(PROJ_docsdir)
-+ $(Verb) $(MKDIR) $(DESTDIR)$(PROJ_docsdir)/ocamldoc/html
-+ $(Verb) $(DataInstall) $(PROJ_OBJ_DIR)/ocamldoc.tar.gz $(DESTDIR)$(PROJ_docsdir)
- $(Verb) cd $(PROJ_OBJ_DIR)/ocamldoc && \
- $(FIND) . -type f -exec \
-- $(DataInstall) {} $(PROJ_docsdir)/ocamldoc/html \;
-+ $(DataInstall) {} $(DESTDIR)$(PROJ_docsdir)/ocamldoc/html \;
-
- ocamldoc: regen-ocamldoc $(PROJ_OBJ_DIR)/ocamldoc.tar.gz
-
-@@ -122,4 +122,4 @@ $(PROJ_OBJ_DIR)/ocamldoc.tar.gz:
-
- uninstall-local::
- $(Echo) Uninstalling Documentation
-- $(Verb) $(RM) -rf $(PROJ_docsdir)
-+ $(Verb) $(RM) -rf $(DESTDIR)$(PROJ_docsdir)
-diff --git docs/tutorial/Makefile docs/tutorial/Makefile
-index 6169bb8..9082ad4 100644
---- docs/tutorial/Makefile
-+++ docs/tutorial/Makefile
-@@ -12,7 +12,7 @@ include $(LEVEL)/Makefile.common
-
- HTML := $(wildcard $(PROJ_SRC_DIR)/*.html)
- EXTRA_DIST := $(HTML) index.html
--HTML_DIR := $(PROJ_docsdir)/html/tutorial
-+HTML_DIR := $(DESTDIR)$(PROJ_docsdir)/html/tutorial
-
- install-local:: $(HTML)
- $(Echo) Installing HTML Tutorial Documentation
-diff --git lib/VMCore/Makefile lib/VMCore/Makefile
-index e9d3dc8..c4817a5 100644
---- lib/VMCore/Makefile
-+++ lib/VMCore/Makefile
-@@ -29,5 +29,5 @@ $(GENFILE): $(ObjDir)/Intrinsics.gen.tmp
- changed significantly. )
-
- install-local:: $(GENFILE)
-- $(Echo) Installing $(PROJ_includedir)/llvm/Intrinsics.gen
-- $(Verb) $(DataInstall) $(GENFILE) $(PROJ_includedir)/llvm/Intrinsics.gen
-+ $(Echo) Installing $(DESTDIR)$(PROJ_includedir)/llvm/Intrinsics.gen
-+ $(Verb) $(DataInstall) $(GENFILE) $(DESTDIR)$(PROJ_includedir)/llvm/Intrinsics.gen
-diff --git tools/gccas/Makefile tools/gccas/Makefile
-index ff84d96..594f9e4 100644
---- tools/gccas/Makefile
-+++ tools/gccas/Makefile
-@@ -10,9 +10,9 @@ LEVEL = ../..
-
- include $(LEVEL)/Makefile.common
-
--install-local:: $(PROJ_bindir)/gccas
-+install-local:: $(DESTDIR)$(PROJ_bindir)/gccas
-
--$(PROJ_bindir)/gccas : gccas.sh Makefile
-+$(DESTDIR)$(PROJ_bindir)/gccas : gccas.sh Makefile
- $(Echo) Installing gccas shell script.
- $(Verb) sed "s#@TOOLDIR@#$(PROJ_bindir)#" $< > $@
- $(Verb) chmod 0755 $@
-diff --git tools/gccld/Makefile tools/gccld/Makefile
-index b2d3f73..8ec0307 100644
---- tools/gccld/Makefile
-+++ tools/gccld/Makefile
-@@ -11,9 +11,9 @@ LEVEL = ../..
-
- include $(LEVEL)/Makefile.common
-
--install-local:: $(PROJ_bindir)/gccld
-+install-local:: $(DESTDIR)$(PROJ_bindir)/gccld
-
--$(PROJ_bindir)/gccld : gccld.sh Makefile
-+$(DESTDIR)$(PROJ_bindir)/gccld : gccld.sh Makefile
- $(Echo) Installing gccld shell script.
- $(Verb) sed "s#@TOOLDIR@#$(PROJ_bindir)#" $< > $@
- $(Verb) chmod 0755 $@
-diff --git tools/llvm-config/Makefile tools/llvm-config/Makefile
-index 6eedca0..8659681 100644
---- tools/llvm-config/Makefile
-+++ tools/llvm-config/Makefile
-@@ -87,6 +87,6 @@ clean-local::
- $(LibDeps) GenLibDeps.out
- install-local:: all-local
- $(Echo) Installing llvm-config
-- $(Verb) $(MKDIR) $(PROJ_bindir)
-- $(Verb) $(ScriptInstall) $(ToolDir)/llvm-config $(PROJ_bindir)
-+ $(Verb) $(MKDIR) $(DESTDIR)$(PROJ_bindir)
-+ $(Verb) $(ScriptInstall) $(ToolDir)/llvm-config $(DESTDIR)$(PROJ_bindir)
-
-
---------------1.6.4--
-
-
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/llvm.git/commitdiff/ebde279df8cc4ba2fbf80ebf3147775034d245f2
More information about the pld-cvs-commit
mailing list