[llvm-commits] CVS: llvm/Makefile.rules

[Reid Spencer]

Changes in directory llvm:

Makefile.rules updated: 1.337 -> 1.338
---
Log message:

For PR625: http://llvm.cs.uiuc.edu/PR625 :
Don't install contents of CVS directories and don't double install when
srcdir == objdir.


---
Diffs of the changes:  (+3 -1)

 Makefile.rules |    4 +++-
 1 files changed, 3 insertions(+), 1 deletion(-)


Index: llvm/Makefile.rules
diff -u llvm/Makefile.rules:1.337 llvm/Makefile.rules:1.338
--- llvm/Makefile.rules:1.337	Wed Dec 21 17:17:06 2005
+++ llvm/Makefile.rules	Fri Dec 23 16:27:56 2005
@@ -1568,12 +1568,14 @@
 	    $(DataInstall) $$hdr $(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` ; do \
+	  for hdr in `find . -type f -print | grep -v CVS` ; do \
 	    $(DataInstall) $$hdr $(PROJ_includedir)/$$hdr ; \
 	  done ; \
 	fi
+endif
 
 uninstall-local::
 	$(Echo) Uninstalling include files