[llvm-branch-commits] [llvm-branch] r127689 - in /llvm/branches/release_29: ./ Makefile.rules

[Bill Wendling]

Author: void
Date: Tue Mar 15 15:00:14 2011
New Revision: 127689

URL: http://llvm.org/viewvc/llvm-project?rev=127689&view=rev
Log:
For PR2928
--- Merging r127325 into '.':
U    Makefile.rules


Modified:
    llvm/branches/release_29/   (props changed)
    llvm/branches/release_29/Makefile.rules

Propchange: llvm/branches/release_29/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 15 15:00:14 2011
@@ -1,2 +1,2 @@
 /llvm/branches/Apple/Pertwee:110850,110961
-/llvm/trunk:127241,127263-127264,127298,127350-127351,127441,127464
+/llvm/trunk:127241,127263-127264,127298,127325,127350-127351,127441,127464

Modified: llvm/branches/release_29/Makefile.rules
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_29/Makefile.rules?rev=127689&r1=127688&r2=127689&view=diff
==============================================================================
--- llvm/branches/release_29/Makefile.rules (original)
+++ llvm/branches/release_29/Makefile.rules Tue Mar 15 15:00:14 2011
@@ -2139,8 +2139,13 @@
 	$(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 | \
+	  for hdr in `find . -type f \
+	      '(' -name LICENSE.TXT \
+	       -o -name '*.def' \
+	       -o -name '*.h' \
+	       -o -name '*.inc' \
+	       -o -name '*.td' \
+	      ')' -print | grep -v CVS | \
 	      grep -v .svn` ; do \
 	    instdir=`dirname "$(DESTDIR)$(PROJ_includedir)/$$hdr"` ; \
 	    if test \! -d "$$instdir" ; then \
@@ -2153,7 +2158,19 @@
 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 \
+	  for hdr in `find . -type f \
+	      '(' -name LICENSE.TXT \
+	       -o -name '*.def' \
+	       -o -name '*.h' \
+	       -o -name '*.inc' \
+	       -o -name '*.td' \
+	      ')' -print | grep -v CVS | \
+	      grep -v .svn` ; do \
+	    instdir=`dirname "$(DESTDIR)$(PROJ_includedir)/$$hdr"` ; \
+	    if test \! -d "$$instdir" ; then \
+	      $(EchoCmd) Making install directory $$instdir ; \
+	      $(MKDIR) $$instdir ;\
+	    fi ; \
 	    $(DataInstall) $$hdr $(DESTDIR)$(PROJ_includedir)/$$hdr ; \
 	  done ; \
 	fi