[llvm-branch-commits] [cfe-branch] r98304 - in /cfe/branches/release_27: ./ Makefile

[Tanya Lattner]

Author: tbrethou
Date: Thu Mar 11 17:49:45 2010
New Revision: 98304

URL: http://llvm.org/viewvc/llvm-project?rev=98304&view=rev
Log:
Merge r98192 from mainline.
add DESTDIR support for clang headers, PR6556.
Patch by Matthias Klose!

Modified:
    cfe/branches/release_27/   (props changed)
    cfe/branches/release_27/Makefile

Propchange: cfe/branches/release_27/
------------------------------------------------------------------------------
    svn:mergeinfo = /cfe/trunk:98192

Modified: cfe/branches/release_27/Makefile
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_27/Makefile?rev=98304&r1=98303&r2=98304&view=diff
==============================================================================
--- cfe/branches/release_27/Makefile (original)
+++ cfe/branches/release_27/Makefile Thu Mar 11 17:49:45 2010
@@ -39,19 +39,19 @@
 
 install-local::
 	$(Echo) Installing include files
-	$(Verb) $(MKDIR) $(PROJ_includedir)
+	$(Verb) $(MKDIR) $(DESTDIR)$(PROJ_includedir)
 	$(Verb) if test -d "$(PROJ_SRC_ROOT)/tools/clang/include" ; then \
 	  cd $(PROJ_SRC_ROOT)/tools/clang/include && \
 	  for  hdr in `find . -type f '!' '(' -name '*~' \
 	      -o -name '.#*' -o -name '*.in' -o -name '*.txt' \
 	      -o -name 'Makefile' -o -name '*.td' ')' -print \
               | grep -v CVS | grep -v .svn | grep -v .dir` ; do \
-	    instdir=`dirname "$(PROJ_includedir)/$$hdr"` ; \
+	    instdir=$(DESTDIR)`dirname "$(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))
@@ -59,7 +59,7 @@
 	  cd $(PROJ_OBJ_ROOT)/tools/clang/include && \
 	  for hdr in `find . -type f '!' '(' -name 'Makefile' ')' -print \
             | grep -v CVS | grep -v .tmp | grep -v .dir` ; do \
-	    $(DataInstall) $$hdr $(PROJ_includedir)/$$hdr ; \
+	    $(DataInstall) $$hdr $(DESTDIR)$(PROJ_includedir)/$$hdr ; \
 	  done ; \
 	fi
 endif