projects
/
oota-llvm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update ExceptionDemo to use ConstantDataArray.
[oota-llvm.git]
/
Makefile.config.in
diff --git
a/Makefile.config.in
b/Makefile.config.in
index dd948bf1f3603dcc337475dc65ff23382412048a..b565bb44f7cbb5b87f6dbe6b2c671e44caaa02a5 100644
(file)
--- a/
Makefile.config.in
+++ b/
Makefile.config.in
@@
-13,7
+13,7
@@
#===------------------------------------------------------------------------===#
# Define LLVM specific info and directories based on the autoconf variables
#===------------------------------------------------------------------------===#
# Define LLVM specific info and directories based on the autoconf variables
-LLVMPackageName := @PACKAGE_NAME@
+LLVMPackageName := @PACKAGE_
TAR
NAME@
LLVMVersion := @PACKAGE_VERSION@
LLVM_CONFIGTIME := @LLVM_CONFIGTIME@
LLVMVersion := @PACKAGE_VERSION@
LLVM_CONFIGTIME := @LLVM_CONFIGTIME@
@@
-48,7
+48,7
@@
PROJ_OBJ_ROOT := $(call realpath, $(PROJ_OBJ_DIR)/$(LEVEL))
CLANG_SRC_ROOT := @CLANG_SRC_ROOT@
CLANG_SRC_ROOT := @CLANG_SRC_ROOT@
-ifeq ($(PROJECT_NAME),
llvm
)
+ifeq ($(PROJECT_NAME),
$(LLVMPackageName)
)
LLVM_SRC_ROOT := $(call realpath, @abs_top_srcdir@)
LLVM_OBJ_ROOT := $(call realpath, @abs_top_builddir@)
PROJ_SRC_ROOT := $(LLVM_SRC_ROOT)
LLVM_SRC_ROOT := $(call realpath, @abs_top_srcdir@)
LLVM_OBJ_ROOT := $(call realpath, @abs_top_builddir@)
PROJ_SRC_ROOT := $(LLVM_SRC_ROOT)
@@
-86,6
+86,13
@@
PROJ_VERSION := 1.0
endif
endif
endif
endif
+INTERNAL_PREFIX := @INTERNAL_PREFIX@
+ifneq ($(INTERNAL_PREFIX),)
+PROJ_internal_prefix := $(INTERNAL_PREFIX)
+else
+PROJ_internal_prefix := $(prefix)
+endif
+
PROJ_bindir := $(PROJ_prefix)/bin
PROJ_libdir := $(PROJ_prefix)/lib
PROJ_datadir := $(PROJ_prefix)/share
PROJ_bindir := $(PROJ_prefix)/bin
PROJ_libdir := $(PROJ_prefix)/lib
PROJ_datadir := $(PROJ_prefix)/share