Author: bwilson
Date: Mon Nov 28 02:03:54 2011
New Revision: 145235
URL: http://llvm.org/viewvc/llvm-project?rev=145235&view=rev
Log:
Install c-index-test and clang-c/Index.h as internal files. rdar://10217046
Specify that these files should be installed to the optional internal
install location as specified by configure's --with-internal-prefix.
If that option is not used, they'll be installed to the default prefix
as before.
Modified:
cfe/trunk/include/clang-c/Makefile
cfe/trunk/tools/c-index-test/Makefile
Modified: cfe/trunk/include/clang-c/Makefile
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang-c/Makefile?rev=145235&r1=145234&r2=145235&view=diff
==============================================================================
--- cfe/trunk/include/clang-c/Makefile (original)
+++ cfe/trunk/include/clang-c/Makefile Mon Nov 28 02:03:54 2011
@@ -3,21 +3,23 @@
include $(CLANG_LEVEL)/Makefile
+IntIncludeDir = $(DESTDIR)$(PROJ_internal_prefix)/include
+
install-local::
$(Echo) Installing Clang C API include files
- $(Verb) $(MKDIR) $(DESTDIR)$(PROJ_includedir)
+ $(Verb) $(MKDIR) $(IntIncludeDir)
$(Verb) if test -d "$(PROJ_SRC_ROOT)/tools/clang/include/clang-c" ;
then \
cd $(PROJ_SRC_ROOT)/tools/clang/include && \
for hdr in `find clang-c -type f '!' '(' -name '*~' \
-o -name '.#*' -o -name '*.in' -o -name '*.txt' \
-o -name 'Makefile' -o -name '*.td' ')' -print \
| grep -v CVS | grep -v .svn | grep -v .dir` ; do \
- instdir=$(DESTDIR)`dirname "$(PROJ_includedir)/$$hdr"` ; \
+ instdir=`dirname "$(IntIncludeDir)/$$hdr"` ; \
if test \! -d "$$instdir" ; then \
$(EchoCmd) Making install directory $$instdir ; \
$(MKDIR) $$instdir ;\
fi ; \
- $(DataInstall) $$hdr $(DESTDIR)$(PROJ_includedir)/$$hdr ; \
+ $(DataInstall) $$hdr $(IntIncludeDir)/$$hdr ; \
done ; \
fi
ifneq ($(PROJ_SRC_ROOT),$(PROJ_OBJ_ROOT))
@@ -25,7 +27,7 @@
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 \
- $(DataInstall) $$hdr $(DESTDIR)$(PROJ_includedir)/$$hdr ; \
+ $(DataInstall) $$hdr $(IntIncludeDir)/$$hdr ; \
done ; \
fi
endif
Modified: cfe/trunk/tools/c-index-test/Makefile
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/c-index-test/Makefile?rev=145235&r1=145234&r2=145235&view=diff
==============================================================================
--- cfe/trunk/tools/c-index-test/Makefile (original)
+++ cfe/trunk/tools/c-index-test/Makefile Mon Nov 28 02:03:54 2011
@@ -10,6 +10,10 @@
TOOLNAME = c-index-test
+# If a separate install prefix was specified for internal tools, use it
+# when installing c-index-test.
+INTERNAL_TOOL = 1
+
# No plugins, optimize startup time.
TOOL_NO_EXPORTS = 1
_______________________________________________
cfe-commits mailing list
[email protected]
http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
