[cfe-commits] r149551 - in /cfe/trunk/include: clang-c/Makefile clang/Makefile

[Dylan Noblesmith]

Author: nobled
Date: Wed Feb  1 16:23:31 2012
New Revision: 149551

URL: http://llvm.org/viewvc/llvm-project?rev=149551&view=rev
Log:
make: fix installation of generated header files

The PROJ_SRC_DIR != PROJ_OBJ_DIR path was missing the directory
creation logic that was in the path for non-generated headers.
PR11903.

(The oversight was copied and pasted from LLVM's Makefile.rules,
where it apparently existed since time immemorial til it was
corrected in r127325.)

Modified:
    cfe/trunk/include/clang-c/Makefile
    cfe/trunk/include/clang/Makefile

Modified: cfe/trunk/include/clang-c/Makefile
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang-c/Makefile?rev=149551&r1=149550&r2=149551&view=diff
==============================================================================
--- cfe/trunk/include/clang-c/Makefile (original)
+++ cfe/trunk/include/clang-c/Makefile Wed Feb  1 16:23:31 2012
@@ -27,6 +27,11 @@
 	  cd $(PROJ_OBJ_ROOT)/tools/clang/include && \
 	  for hdr in `find clang-c -type f '!' '(' -name 'Makefile' ')' -print \
             | grep -v CVS | grep -v .tmp | grep -v .dir` ; do \
+	    instdir=`dirname "$(IntIncludeDir)/$$hdr"` ; \
+	    if test \! -d "$$instdir" ; then \
+	      $(EchoCmd) Making install directory $$instdir ; \
+	      $(MKDIR) $$instdir ;\
+	    fi ; \
 	    $(DataInstall) $$hdr $(IntIncludeDir)/$$hdr ; \
 	  done ; \
 	fi

Modified: cfe/trunk/include/clang/Makefile
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Makefile?rev=149551&r1=149550&r2=149551&view=diff
==============================================================================
--- cfe/trunk/include/clang/Makefile (original)
+++ cfe/trunk/include/clang/Makefile Wed Feb  1 16:23:31 2012
@@ -33,6 +33,11 @@
 	       -o -name '*.inc' \
 	      ')' -print \
             | grep -v CVS | grep -v .tmp | grep -v .dir` ; do \
+	    instdir=$(DESTDIR)`dirname "$(PROJ_includedir)/$$hdr"` ; \
+	    if test \! -d "$$instdir" ; then \
+	      $(EchoCmd) Making install directory $$instdir ; \
+	      $(MKDIR) $$instdir ;\
+	    fi ; \
 	    $(DataInstall) $$hdr $(DESTDIR)$(PROJ_includedir)/$$hdr ; \
 	  done ; \
 	fi