For PR625:

Don't install contents of CVS directories and don't double install when
srcdir == objdir.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@24998 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/Makefile.rules b/Makefile.rules
index ccd9fc8f8f57dda186eb1413b3e9b7dc69c0511e..39c741a8838c196a294dbe5529bf000c352fe815 100644 (file)
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -1568,12 +1568,14 @@ install-local::
            $(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