[PATCH] Fix 'make uninstall' target regarding some directories (llvm part)

[Edoardo P.]

Hello. I redid the patch which was posted in August:
http://lists.cs.uiuc.edu/pipermail/llvm-commits/Week-of-Mon-20130805/183645.html

In this patch I removed any reference to CVS in the uninstall part (in
another patch I'll post soon, I removed any reference to CVS as a directory
and replaced cvsbuild/CVSBUILD with vcsbuild/VCSBUILD, which should be more
coherent with .svn and .git search).

It has a cfe equivalent patch (which doesn't change anything) which will be
(re)posted in cfe-commits.

Edward-san
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20131219/0b99893f/attachment.html>
-------------- next part --------------
diff --git a/Makefile.rules b/Makefile.rules
index 32b1ebc..0032f2c 100644
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -2030,17 +2027,42 @@ endif
 
 uninstall-local::
 	$(Echo) Uninstalling include files
-	$(Verb) if [ -d "$(PROJ_SRC_ROOT)/include" ] ; then \
-	  cd $(PROJ_SRC_ROOT)/include && \
-	    $(RM) -f `find . -path '*/Internal' -prune -o '(' -type f \
-	      '!' '(' -name '*~' -o -name '.#*' \
-        -o -name '*.in' ')' -print ')' | \
-        grep -v CVS | sed 's#^#$(DESTDIR)$(PROJ_includedir)/#'` ; \
+	$(Verb) if test -d "$(PROJ_SRC_ROOT)/include" ; then \
 	  cd $(PROJ_SRC_ROOT)/include && \
-	    $(RM) -f `find . -path '*/Internal' -prune -o '(' -type f -name '*.in' \
-      -print ')' | sed 's#\.in$$##;s#^#$(DESTDIR)$(PROJ_includedir)/#'` ; \
+	  for hdr in `find . -type f \
+	      '(' -name LICENSE.TXT \
+	       -o -name '*.def' \
+	       -o -name '*.h' \
+	       -o -name '*.inc' \
+	       -o -name '*.td' \
+	      ')' -print | grep -v .svn` ; do \
+	    instdir=`dirname "$(DESTDIR)$(PROJ_includedir)/$$hdr"` ; \
+	    if test -d "$$instdir" ; then \
+	      $(EchoCmd) Removing install directory $$instdir ; \
+	      $(RM) -rf $$instdir ;\
+	    fi ; \
+	  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 \
+	      '(' -name LICENSE.TXT \
+	       -o -name '*.def' \
+	       -o -name '*.h' \
+	       -o -name '*.inc' \
+	       -o -name '*.td' \
+	      ')' -print | grep -v .svn` ; do \
+	    instdir=`dirname "$(DESTDIR)$(PROJ_includedir)/$$hdr"` ; \
+	    if test -d "$$instdir" ; then \
+	      $(EchoCmd) Removing install directory $$instdir ; \
+	      $(RM) -rf $$instdir ;\
+	    fi ; \
+	  done ; \
 	fi
 endif
+
+endif
 endif
 
 check-line-length: