|
 |
e9ce7d8 |
diff -ru llvm-2.6.orig/docs/CommandGuide/Makefile llvm-2.6/docs/CommandGuide/Makefile
|
|
|
e9ce7d8 |
--- llvm-2.6.orig/docs/CommandGuide/Makefile 2009-08-31 02:25:32.000000000 -0400
|
|
|
e9ce7d8 |
+++ llvm-2.6/docs/CommandGuide/Makefile 2009-09-30 02:28:03.107649582 -0400
|
|
|
e9ce7d8 |
@@ -77,9 +77,9 @@
|
|
|
e9ce7d8 |
clean-local::
|
|
|
e9ce7d8 |
$(Verb) $(RM) -f pod2htm*.*~~ $(HTML) $(MAN) $(PS)
|
|
|
e9ce7d8 |
|
|
|
e9ce7d8 |
-HTML_DIR := $(PROJ_docsdir)/html/CommandGuide
|
|
|
e9ce7d8 |
-MAN_DIR := $(PROJ_mandir)/man1
|
|
|
e9ce7d8 |
-PS_DIR := $(PROJ_docsdir)/ps
|
|
|
e9ce7d8 |
+HTML_DIR := $(DESTDIR)$(PROJ_docsdir)/html/CommandGuide
|
|
|
e9ce7d8 |
+MAN_DIR := $(DESTDIR)$(PROJ_mandir)/man1
|
|
|
e9ce7d8 |
+PS_DIR := $(DESTDIR)$(PROJ_docsdir)/ps
|
|
|
e9ce7d8 |
|
|
|
e9ce7d8 |
install-local:: $(HTML) $(INSTALL_MANS) $(PS)
|
|
|
e9ce7d8 |
$(Echo) Installing HTML CommandGuide Documentation
|
|
|
e9ce7d8 |
diff -ru llvm-2.6.orig/docs/Makefile llvm-2.6/docs/Makefile
|
|
|
e9ce7d8 |
--- llvm-2.6.orig/docs/Makefile 2008-03-31 13:27:57.000000000 -0400
|
|
|
e9ce7d8 |
+++ llvm-2.6/docs/Makefile 2009-09-30 02:28:03.110650445 -0400
|
|
|
e9ce7d8 |
@@ -48,11 +48,11 @@
|
|
|
e9ce7d8 |
|
|
|
e9ce7d8 |
install-html: $(PROJ_OBJ_DIR)/html.tar.gz
|
|
|
e9ce7d8 |
$(Echo) Installing HTML documentation
|
|
|
e9ce7d8 |
- $(Verb) $(MKDIR) $(PROJ_docsdir)/html
|
|
|
e9ce7d8 |
- $(Verb) $(MKDIR) $(PROJ_docsdir)/html/img
|
|
|
e9ce7d8 |
- $(Verb) $(DataInstall) $(HTML) $(PROJ_docsdir)/html
|
|
|
e9ce7d8 |
- $(Verb) $(DataInstall) $(IMAGES) $(PROJ_docsdir)/html/img
|
|
|
e9ce7d8 |
- $(Verb) $(DataInstall) $(PROJ_OBJ_DIR)/html.tar.gz $(PROJ_docsdir)
|
|
|
e9ce7d8 |
+ $(Verb) $(MKDIR) $(DESTDIR)$(PROJ_docsdir)/html
|
|
|
e9ce7d8 |
+ $(Verb) $(MKDIR) $(DESTDIR)$(PROJ_docsdir)/html/img
|
|
|
e9ce7d8 |
+ $(Verb) $(DataInstall) $(HTML) $(DESTDIR)$(PROJ_docsdir)/html
|
|
|
e9ce7d8 |
+ $(Verb) $(DataInstall) $(IMAGES) $(DESTDIR)$(PROJ_docsdir)/html/img
|
|
|
e9ce7d8 |
+ $(Verb) $(DataInstall) $(PROJ_OBJ_DIR)/html.tar.gz $(DESTDIR)$(PROJ_docsdir)
|
|
|
e9ce7d8 |
|
|
|
e9ce7d8 |
$(PROJ_OBJ_DIR)/html.tar.gz: $(HTML)
|
|
|
e9ce7d8 |
$(Echo) Packaging HTML documentation
|
|
|
e9ce7d8 |
@@ -63,11 +63,11 @@
|
|
|
e9ce7d8 |
|
|
|
e9ce7d8 |
install-doxygen: doxygen
|
|
|
e9ce7d8 |
$(Echo) Installing doxygen documentation
|
|
|
e9ce7d8 |
- $(Verb) $(MKDIR) $(PROJ_docsdir)/html/doxygen
|
|
|
e9ce7d8 |
- $(Verb) $(DataInstall) $(PROJ_OBJ_DIR)/doxygen.tar.gz $(PROJ_docsdir)
|
|
|
e9ce7d8 |
+ $(Verb) $(MKDIR) $(DESTDIR)$(PROJ_docsdir)/html/doxygen
|
|
|
e9ce7d8 |
+ $(Verb) $(DataInstall) $(PROJ_OBJ_DIR)/doxygen.tar.gz $(DESTDIR)$(PROJ_docsdir)
|
|
|
e9ce7d8 |
$(Verb) cd $(PROJ_OBJ_DIR)/doxygen && \
|
|
|
e9ce7d8 |
$(FIND) . -type f -exec \
|
|
|
e9ce7d8 |
- $(DataInstall) {} $(PROJ_docsdir)/html/doxygen \;
|
|
|
e9ce7d8 |
+ $(DataInstall) {} $(DESTDIR)$(PROJ_docsdir)/html/doxygen \;
|
|
|
e9ce7d8 |
|
|
|
e9ce7d8 |
doxygen: regendoc $(PROJ_OBJ_DIR)/doxygen.tar.gz
|
|
|
e9ce7d8 |
|
|
|
e9ce7d8 |
@@ -94,11 +94,11 @@
|
|
|
e9ce7d8 |
|
|
|
e9ce7d8 |
install-ocamldoc: ocamldoc
|
|
|
e9ce7d8 |
$(Echo) Installing ocamldoc documentation
|
|
|
e9ce7d8 |
- $(Verb) $(MKDIR) $(PROJ_docsdir)/ocamldoc/html
|
|
|
e9ce7d8 |
- $(Verb) $(DataInstall) $(PROJ_OBJ_DIR)/ocamldoc.tar.gz $(PROJ_docsdir)
|
|
|
e9ce7d8 |
+ $(Verb) $(MKDIR) $(DESTDIR)$(PROJ_docsdir)/ocamldoc/html
|
|
|
e9ce7d8 |
+ $(Verb) $(DataInstall) $(PROJ_OBJ_DIR)/ocamldoc.tar.gz $(DESTDIR)$(PROJ_docsdir)
|
|
|
e9ce7d8 |
$(Verb) cd $(PROJ_OBJ_DIR)/ocamldoc && \
|
|
|
e9ce7d8 |
$(FIND) . -type f -exec \
|
|
|
e9ce7d8 |
- $(DataInstall) {} $(PROJ_docsdir)/ocamldoc/html \;
|
|
|
e9ce7d8 |
+ $(DataInstall) {} $(DESTDIR)$(PROJ_docsdir)/ocamldoc/html \;
|
|
|
e9ce7d8 |
|
|
|
e9ce7d8 |
ocamldoc: regen-ocamldoc $(PROJ_OBJ_DIR)/ocamldoc.tar.gz
|
|
|
e9ce7d8 |
|
|
|
e9ce7d8 |
@@ -122,4 +122,4 @@
|
|
|
e9ce7d8 |
|
|
|
e9ce7d8 |
uninstall-local::
|
|
|
e9ce7d8 |
$(Echo) Uninstalling Documentation
|
|
|
e9ce7d8 |
- $(Verb) $(RM) -rf $(PROJ_docsdir)
|
|
|
e9ce7d8 |
+ $(Verb) $(RM) -rf $(DESTDIR)$(PROJ_docsdir)
|
|
|
e9ce7d8 |
diff -ru llvm-2.6.orig/docs/tutorial/Makefile llvm-2.6/docs/tutorial/Makefile
|
|
|
e9ce7d8 |
--- llvm-2.6.orig/docs/tutorial/Makefile 2008-03-30 16:32:18.000000000 -0400
|
|
|
e9ce7d8 |
+++ llvm-2.6/docs/tutorial/Makefile 2009-09-30 02:28:03.112652092 -0400
|
|
|
e9ce7d8 |
@@ -12,7 +12,7 @@
|
|
|
e9ce7d8 |
|
|
|
e9ce7d8 |
HTML := $(wildcard $(PROJ_SRC_DIR)/*.html)
|
|
|
e9ce7d8 |
EXTRA_DIST := $(HTML) index.html
|
|
|
e9ce7d8 |
-HTML_DIR := $(PROJ_docsdir)/html/tutorial
|
|
|
e9ce7d8 |
+HTML_DIR := $(DESTDIR)$(PROJ_docsdir)/html/tutorial
|
|
|
e9ce7d8 |
|
|
|
e9ce7d8 |
install-local:: $(HTML)
|
|
|
e9ce7d8 |
$(Echo) Installing HTML Tutorial Documentation
|
|
|
e9ce7d8 |
diff -ru llvm-2.6.orig/lib/VMCore/Makefile llvm-2.6/lib/VMCore/Makefile
|
|
|
e9ce7d8 |
--- llvm-2.6.orig/lib/VMCore/Makefile 2009-01-09 11:44:42.000000000 -0500
|
|
|
e9ce7d8 |
+++ llvm-2.6/lib/VMCore/Makefile 2009-09-30 02:28:03.114651503 -0400
|
|
|
e9ce7d8 |
@@ -29,5 +29,5 @@
|
|
|
e9ce7d8 |
changed significantly. )
|
|
|
e9ce7d8 |
|
|
|
e9ce7d8 |
install-local:: $(GENFILE)
|
|
|
e9ce7d8 |
- $(Echo) Installing $(PROJ_includedir)/llvm/Intrinsics.gen
|
|
|
e9ce7d8 |
- $(Verb) $(DataInstall) $(GENFILE) $(PROJ_includedir)/llvm/Intrinsics.gen
|
|
|
e9ce7d8 |
+ $(Echo) Installing $(DESTDIR)$(PROJ_includedir)/llvm/Intrinsics.gen
|
|
|
e9ce7d8 |
+ $(Verb) $(DataInstall) $(GENFILE) $(DESTDIR)$(PROJ_includedir)/llvm/Intrinsics.gen
|
|
|
e9ce7d8 |
diff -ru llvm-2.6.orig/Makefile.config.in llvm-2.6/Makefile.config.in
|
|
|
e9ce7d8 |
--- llvm-2.6.orig/Makefile.config.in 2009-08-17 20:40:33.000000000 -0400
|
|
|
e9ce7d8 |
+++ llvm-2.6/Makefile.config.in 2009-09-30 02:28:03.099649281 -0400
|
|
|
e9ce7d8 |
@@ -76,14 +76,14 @@
|
|
|
c6833e1 |
|
|
|
c6833e1 |
LLVMMAKE := $(LLVM_SRC_ROOT)/make
|
|
|
c6833e1 |
|
|
|
c6833e1 |
-PROJ_bindir := $(DESTDIR)$(PROJ_prefix)/bin
|
|
|
c6833e1 |
-PROJ_libdir := $(DESTDIR)$(PROJ_prefix)/lib
|
|
|
c6833e1 |
-PROJ_datadir := $(DESTDIR)$(PROJ_prefix)/share
|
|
|
c6833e1 |
-PROJ_docsdir := $(DESTDIR)$(PROJ_prefix)/docs/llvm
|
|
|
c6833e1 |
-PROJ_etcdir := $(DESTDIR)$(PROJ_prefix)/etc/llvm
|
|
|
c6833e1 |
-PROJ_includedir := $(DESTDIR)$(PROJ_prefix)/include
|
|
|
c6833e1 |
-PROJ_infodir := $(DESTDIR)$(PROJ_prefix)/info
|
|
|
c6833e1 |
-PROJ_mandir := $(DESTDIR)$(PROJ_prefix)/share/man
|
|
|
c6833e1 |
+PROJ_bindir := $(PROJ_prefix)/bin
|
|
|
c6833e1 |
+PROJ_libdir := $(PROJ_prefix)/lib
|
|
|
c6833e1 |
+PROJ_datadir := $(PROJ_prefix)/share
|
|
|
c6833e1 |
+PROJ_docsdir := $(PROJ_prefix)/docs/llvm
|
|
|
c6833e1 |
+PROJ_etcdir := $(PROJ_prefix)/etc/llvm
|
|
|
c6833e1 |
+PROJ_includedir := $(PROJ_prefix)/include
|
|
|
c6833e1 |
+PROJ_infodir := $(PROJ_prefix)/info
|
|
|
c6833e1 |
+PROJ_mandir := $(PROJ_prefix)/share/man
|
|
|
c6833e1 |
|
|
|
c6833e1 |
# Determine if we're on a unix type operating system
|
|
|
c6833e1 |
LLVM_ON_UNIX:=@LLVM_ON_UNIX@
|
|
|
e9ce7d8 |
diff -ru llvm-2.6.orig/Makefile.rules llvm-2.6/Makefile.rules
|
|
|
e9ce7d8 |
--- llvm-2.6.orig/Makefile.rules 2009-09-12 18:25:41.000000000 -0400
|
|
|
e9ce7d8 |
+++ llvm-2.6/Makefile.rules 2009-09-30 02:28:03.104648788 -0400
|
|
|
e9ce7d8 |
@@ -725,7 +725,7 @@
|
|
|
c6833e1 |
# in the file so they get built before dependencies
|
|
|
c6833e1 |
#---------------------------------------------------------
|
|
|
c6833e1 |
|
|
|
c6833e1 |
-$(PROJ_bindir) $(PROJ_libdir) $(PROJ_includedir) $(PROJ_etcdir)::
|
|
|
c6833e1 |
+$(DESTDIR)$(PROJ_bindir) $(DESTDIR)$(PROJ_libdir) $(DESTDIR)$(PROJ_includedir) $(DESTDIR)$(PROJ_etcdir)::
|
|
|
c6833e1 |
$(Verb) $(MKDIR) $@
|
|
|
c6833e1 |
|
|
|
c6833e1 |
# To create other directories, as needed, and timestamp their creation
|
|
|
e9ce7d8 |
@@ -847,22 +847,22 @@
|
|
|
c6833e1 |
uninstall-local::
|
|
|
c6833e1 |
$(Echo) UnInstall circumvented with NO_INSTALL
|
|
|
c6833e1 |
else
|
|
|
c6833e1 |
-install-local:: $(PROJ_etcdir) $(CONFIG_FILES)
|
|
|
c6833e1 |
- $(Echo) Installing Configuration Files To $(PROJ_etcdir)
|
|
|
c6833e1 |
+install-local:: $(DESTDIR)$(PROJ_etcdir) $(CONFIG_FILES)
|
|
|
c6833e1 |
+ $(Echo) Installing Configuration Files To $(DESTDIR)$(PROJ_etcdir)
|
|
|
c6833e1 |
$(Verb)for file in $(CONFIG_FILES); do \
|
|
|
c6833e1 |
if test -f $(PROJ_OBJ_DIR)/$${file} ; then \
|
|
|
c6833e1 |
- $(DataInstall) $(PROJ_OBJ_DIR)/$${file} $(PROJ_etcdir) ; \
|
|
|
c6833e1 |
+ $(DataInstall) $(PROJ_OBJ_DIR)/$${file} $(DESTDIR)$(PROJ_etcdir) ; \
|
|
|
c6833e1 |
elif test -f $(PROJ_SRC_DIR)/$${file} ; then \
|
|
|
c6833e1 |
- $(DataInstall) $(PROJ_SRC_DIR)/$${file} $(PROJ_etcdir) ; \
|
|
|
c6833e1 |
+ $(DataInstall) $(PROJ_SRC_DIR)/$${file} $(DESTDIR)$(PROJ_etcdir) ; \
|
|
|
c6833e1 |
else \
|
|
|
c6833e1 |
$(ECHO) Error: cannot find config file $${file}. ; \
|
|
|
c6833e1 |
fi \
|
|
|
c6833e1 |
done
|
|
|
c6833e1 |
|
|
|
c6833e1 |
uninstall-local::
|
|
|
c6833e1 |
- $(Echo) Uninstalling Configuration Files From $(PROJ_etcdir)
|
|
|
c6833e1 |
+ $(Echo) Uninstalling Configuration Files From $(DESTDIR)$(PROJ_etcdir)
|
|
|
c6833e1 |
$(Verb)for file in $(CONFIG_FILES); do \
|
|
|
c6833e1 |
- $(RM) -f $(PROJ_etcdir)/$${file} ; \
|
|
|
c6833e1 |
+ $(RM) -f $(DESTDIR)$(PROJ_etcdir)/$${file} ; \
|
|
|
c6833e1 |
done
|
|
|
c6833e1 |
endif
|
|
|
c6833e1 |
|
|
|
e9ce7d8 |
@@ -949,7 +949,7 @@
|
|
|
c6833e1 |
ifdef BYTECODE_DESTINATION
|
|
|
c6833e1 |
ModuleDestDir := $(BYTECODE_DESTINATION)
|
|
|
c6833e1 |
else
|
|
|
c6833e1 |
-ModuleDestDir := $(PROJ_libdir)
|
|
|
c6833e1 |
+ModuleDestDir := $(DESTDIR)$(PROJ_libdir)
|
|
|
c6833e1 |
endif
|
|
|
c6833e1 |
|
|
|
c6833e1 |
ifdef NO_INSTALL
|
|
|
e9ce7d8 |
@@ -1028,17 +1028,17 @@
|
|
|
c6833e1 |
uninstall-local::
|
|
|
c6833e1 |
$(Echo) Uninstall circumvented with NO_INSTALL
|
|
|
c6833e1 |
else
|
|
|
c6833e1 |
-DestSharedLib = $(PROJ_libdir)/lib$(LIBRARYNAME)$(SHLIBEXT)
|
|
|
c6833e1 |
+DestSharedLib = $(DESTDIR)$(PROJ_libdir)/lib$(LIBRARYNAME)$(SHLIBEXT)
|
|
|
c6833e1 |
|
|
|
c6833e1 |
install-local:: $(DestSharedLib)
|
|
|
c6833e1 |
|
|
|
c6833e1 |
-$(DestSharedLib): $(LibName.SO) $(PROJ_libdir)
|
|
|
c6833e1 |
+$(DestSharedLib): $(LibName.SO) $(DESTDIR)$(PROJ_libdir)
|
|
|
c6833e1 |
$(Echo) Installing $(BuildMode) Shared Library $(DestSharedLib)
|
|
|
c6833e1 |
$(Verb) $(INSTALL) $(LibName.SO) $(DestSharedLib)
|
|
|
c6833e1 |
|
|
|
c6833e1 |
uninstall-local::
|
|
|
c6833e1 |
$(Echo) Uninstalling $(BuildMode) Shared Library $(DestSharedLib)
|
|
|
c6833e1 |
- -$(Verb) $(RM) -f $(PROJ_libdir)/lib$(LIBRARYNAME).*
|
|
|
c6833e1 |
+ -$(Verb) $(RM) -f $(DESTDIR)$(PROJ_libdir)/lib$(LIBRARYNAME).*
|
|
|
c6833e1 |
endif
|
|
|
c6833e1 |
endif
|
|
|
c6833e1 |
|
|
|
e9ce7d8 |
@@ -1083,7 +1083,7 @@
|
|
|
c6833e1 |
ifdef BYTECODE_DESTINATION
|
|
|
c6833e1 |
BytecodeDestDir := $(BYTECODE_DESTINATION)
|
|
|
c6833e1 |
else
|
|
|
c6833e1 |
-BytecodeDestDir := $(PROJ_libdir)
|
|
|
c6833e1 |
+BytecodeDestDir := $(DESTDIR)$(PROJ_libdir)
|
|
|
c6833e1 |
endif
|
|
|
c6833e1 |
|
|
|
c6833e1 |
DestBytecodeLib = $(BytecodeDestDir)/lib$(LIBRARYNAME).bca
|
|
|
e9ce7d8 |
@@ -1146,13 +1146,13 @@
|
|
|
c6833e1 |
uninstall-local::
|
|
|
c6833e1 |
$(Echo) Uninstall circumvented with NO_INSTALL
|
|
|
c6833e1 |
else
|
|
|
c6833e1 |
-DestArchiveLib := $(PROJ_libdir)/lib$(LIBRARYNAME).a
|
|
|
c6833e1 |
+DestArchiveLib := $(DESTDIR)$(PROJ_libdir)/lib$(LIBRARYNAME).a
|
|
|
c6833e1 |
|
|
|
c6833e1 |
install-local:: $(DestArchiveLib)
|
|
|
c6833e1 |
|
|
|
c6833e1 |
-$(DestArchiveLib): $(LibName.A) $(PROJ_libdir)
|
|
|
c6833e1 |
+$(DestArchiveLib): $(LibName.A) $(DESTDIR)$(PROJ_libdir)
|
|
|
c6833e1 |
$(Echo) Installing $(BuildMode) Archive Library $(DestArchiveLib)
|
|
|
c6833e1 |
- $(Verb) $(MKDIR) $(PROJ_libdir)
|
|
|
c6833e1 |
+ $(Verb) $(MKDIR) $(DESTDIR)$(PROJ_libdir)
|
|
|
c6833e1 |
$(Verb) $(INSTALL) $(LibName.A) $(DestArchiveLib)
|
|
|
c6833e1 |
|
|
|
c6833e1 |
uninstall-local::
|
|
|
e9ce7d8 |
@@ -1230,11 +1230,11 @@
|
|
|
c6833e1 |
uninstall-local::
|
|
|
c6833e1 |
$(Echo) Uninstall circumvented with NO_INSTALL
|
|
|
c6833e1 |
else
|
|
|
c6833e1 |
-DestTool = $(PROJ_bindir)/$(TOOLNAME)$(EXEEXT)
|
|
|
c6833e1 |
+DestTool = $(DESTDIR)$(PROJ_bindir)/$(TOOLNAME)$(EXEEXT)
|
|
|
c6833e1 |
|
|
|
c6833e1 |
install-local:: $(DestTool)
|
|
|
c6833e1 |
|
|
|
c6833e1 |
-$(DestTool): $(ToolBuildPath) $(PROJ_bindir)
|
|
|
c6833e1 |
+$(DestTool): $(ToolBuildPath) $(DESTDIR)$(PROJ_bindir)
|
|
|
c6833e1 |
$(Echo) Installing $(BuildMode) $(DestTool)
|
|
|
c6833e1 |
$(Verb) $(ProgInstall) $(ToolBuildPath) $(DestTool)
|
|
|
c6833e1 |
|
|
|
e9ce7d8 |
@@ -1829,25 +1829,25 @@
|
|
|
c6833e1 |
else
|
|
|
c6833e1 |
install-local::
|
|
|
c6833e1 |
$(Echo) Installing include files
|
|
|
c6833e1 |
- $(Verb) $(MKDIR) $(PROJ_includedir)
|
|
|
c6833e1 |
+ $(Verb) $(MKDIR) $(DESTDIR)$(PROJ_includedir)
|
|
|
c6833e1 |
$(Verb) if test -d "$(PROJ_SRC_ROOT)/include" ; then \
|
|
|
c6833e1 |
cd $(PROJ_SRC_ROOT)/include && \
|
|
|
c6833e1 |
for hdr in `find . -type f '!' '(' -name '*~' \
|
|
|
c6833e1 |
-o -name '.#*' -o -name '*.in' ')' -print | grep -v CVS | \
|
|
|
c6833e1 |
grep -v .svn` ; do \
|
|
|
c6833e1 |
- instdir=`dirname "$(PROJ_includedir)/$$hdr"` ; \
|
|
|
c6833e1 |
+ instdir=`dirname "$(DESTDIR)$(PROJ_includedir)/$$hdr"` ; \
|
|
|
c6833e1 |
if test \! -d "$$instdir" ; then \
|
|
|
c6833e1 |
$(EchoCmd) Making install directory $$instdir ; \
|
|
|
c6833e1 |
$(MKDIR) $$instdir ;\
|
|
|
c6833e1 |
fi ; \
|
|
|
c6833e1 |
- $(DataInstall) $$hdr $(PROJ_includedir)/$$hdr ; \
|
|
|
c6833e1 |
+ $(DataInstall) $$hdr $(DESTDIR)$(PROJ_includedir)/$$hdr ; \
|
|
|
c6833e1 |
done ; \
|
|
|
c6833e1 |
fi
|
|
|
c6833e1 |
ifneq ($(PROJ_SRC_ROOT),$(PROJ_OBJ_ROOT))
|
|
|
c6833e1 |
$(Verb) if test -d "$(PROJ_OBJ_ROOT)/include" ; then \
|
|
|
c6833e1 |
cd $(PROJ_OBJ_ROOT)/include && \
|
|
|
c6833e1 |
for hdr in `find . -type f -print | grep -v CVS` ; do \
|
|
|
c6833e1 |
- $(DataInstall) $$hdr $(PROJ_includedir)/$$hdr ; \
|
|
|
c6833e1 |
+ $(DataInstall) $$hdr $(DESTDIR)$(PROJ_includedir)/$$hdr ; \
|
|
|
c6833e1 |
done ; \
|
|
|
c6833e1 |
fi
|
|
|
c6833e1 |
endif
|
|
|
e9ce7d8 |
@@ -1859,10 +1859,10 @@
|
|
|
c6833e1 |
$(RM) -f `find . -path '*/Internal' -prune -o '(' -type f \
|
|
|
c6833e1 |
'!' '(' -name '*~' -o -name '.#*' \
|
|
|
c6833e1 |
-o -name '*.in' ')' -print ')' | \
|
|
|
c6833e1 |
- grep -v CVS | sed 's#^#$(PROJ_includedir)/#'` ; \
|
|
|
c6833e1 |
+ grep -v CVS | sed 's#^#$(DESTDIR)$(PROJ_includedir)/#'` ; \
|
|
|
c6833e1 |
cd $(PROJ_SRC_ROOT)/include && \
|
|
|
c6833e1 |
$(RM) -f `find . -path '*/Internal' -prune -o '(' -type f -name '*.in' \
|
|
|
c6833e1 |
- -print ')' | sed 's#\.in$$##;s#^#$(PROJ_includedir)/#'` ; \
|
|
|
c6833e1 |
+ -print ')' | sed 's#\.in$$##;s#^#$(DESTDIR)$(PROJ_includedir)/#'` ; \
|
|
|
c6833e1 |
fi
|
|
|
c6833e1 |
endif
|
|
|
c6833e1 |
endif
|
|
|
e9ce7d8 |
diff -ru llvm-2.6.orig/tools/gccas/Makefile llvm-2.6/tools/gccas/Makefile
|
|
|
e9ce7d8 |
--- llvm-2.6.orig/tools/gccas/Makefile 2007-12-29 15:07:17.000000000 -0500
|
|
|
e9ce7d8 |
+++ llvm-2.6/tools/gccas/Makefile 2009-09-30 02:28:03.116650426 -0400
|
|
|
e9ce7d8 |
@@ -10,9 +10,9 @@
|
|
|
c6833e1 |
|
|
|
c6833e1 |
include $(LEVEL)/Makefile.common
|
|
|
c6833e1 |
|
|
|
c6833e1 |
-install-local:: $(PROJ_bindir)/gccas
|
|
|
c6833e1 |
+install-local:: $(DESTDIR)$(PROJ_bindir)/gccas
|
|
|
c6833e1 |
|
|
|
c6833e1 |
-$(PROJ_bindir)/gccas : gccas.sh Makefile
|
|
|
c6833e1 |
+$(DESTDIR)$(PROJ_bindir)/gccas : gccas.sh Makefile
|
|
|
c6833e1 |
$(Echo) Installing gccas shell script.
|
|
|
c6833e1 |
$(Verb) sed "s#@TOOLDIR@#$(PROJ_bindir)#" $< > $@
|
|
|
c6833e1 |
$(Verb) chmod 0755 $@
|
|
|
e9ce7d8 |
diff -ru llvm-2.6.orig/tools/gccld/Makefile llvm-2.6/tools/gccld/Makefile
|
|
|
e9ce7d8 |
--- llvm-2.6.orig/tools/gccld/Makefile 2007-12-29 15:07:17.000000000 -0500
|
|
|
e9ce7d8 |
+++ llvm-2.6/tools/gccld/Makefile 2009-09-30 02:28:03.117649993 -0400
|
|
|
e9ce7d8 |
@@ -11,9 +11,9 @@
|
|
|
c6833e1 |
|
|
|
c6833e1 |
include $(LEVEL)/Makefile.common
|
|
|
c6833e1 |
|
|
|
c6833e1 |
-install-local:: $(PROJ_bindir)/gccld
|
|
|
c6833e1 |
+install-local:: $(DESTDIR)$(PROJ_bindir)/gccld
|
|
|
c6833e1 |
|
|
|
c6833e1 |
-$(PROJ_bindir)/gccld : gccld.sh Makefile
|
|
|
c6833e1 |
+$(DESTDIR)$(PROJ_bindir)/gccld : gccld.sh Makefile
|
|
|
c6833e1 |
$(Echo) Installing gccld shell script.
|
|
|
c6833e1 |
$(Verb) sed "s#@TOOLDIR@#$(PROJ_bindir)#" $< > $@
|
|
|
c6833e1 |
$(Verb) chmod 0755 $@
|
|
|
e9ce7d8 |
diff -ru llvm-2.6.orig/tools/llvm-config/Makefile llvm-2.6/tools/llvm-config/Makefile
|
|
|
e9ce7d8 |
--- llvm-2.6.orig/tools/llvm-config/Makefile 2009-03-10 15:01:23.000000000 -0400
|
|
|
e9ce7d8 |
+++ llvm-2.6/tools/llvm-config/Makefile 2009-09-30 02:28:03.119650243 -0400
|
|
|
e9ce7d8 |
@@ -87,6 +87,6 @@
|
|
|
c6833e1 |
$(LibDeps) GenLibDeps.out
|
|
|
c6833e1 |
install-local:: all-local
|
|
|
c6833e1 |
$(Echo) Installing llvm-config
|
|
|
c6833e1 |
- $(Verb) $(MKDIR) $(PROJ_bindir)
|
|
|
c6833e1 |
- $(Verb) $(ScriptInstall) $(ToolDir)/llvm-config $(PROJ_bindir)
|
|
|
c6833e1 |
+ $(Verb) $(MKDIR) $(DESTDIR)$(PROJ_bindir)
|
|
|
c6833e1 |
+ $(Verb) $(ScriptInstall) $(ToolDir)/llvm-config $(DESTDIR)$(PROJ_bindir)
|
|
|
c6833e1 |
|