X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=Makefile.config.in;h=069b9724a34890eee072a20611c0edf25a508e7c;hb=601e845d6088dc9115032b73404feeb4279abf77;hp=f7642c2117837664564a29e903f7471fa244e9a3;hpb=1000b73397bd72b71ede338caf5b6379072d94a4;p=oota-llvm.git

diff --git a/Makefile.config.in b/Makefile.config.in
index f7642c21178..069b9724a34 100644
--- a/Makefile.config.in
+++ b/Makefile.config.in
@@ -47,15 +47,8 @@ LLVM_SRC_ROOT   := $(shell cd @abs_top_srcdir@; $(PWD))
 LLVM_OBJ_ROOT   := $(shell cd @abs_top_builddir@; $(PWD))
 PROJ_SRC_ROOT   := $(shell cd $(LLVM_SRC_ROOT); $(PWD))
 PROJ_SRC_DIR    := $(shell cd $(LLVM_SRC_ROOT)/$(patsubst $(PROJ_OBJ_ROOT)%,%,$(PROJ_OBJ_DIR)); $(PWD))
-PROJ_prefix     := @prefix@
-PROJ_bindir     := @prefix@/bin
-PROJ_libdir     := @prefix@/lib
-PROJ_datadir    := @prefix@/share
-PROJ_docsdir    := @prefix@/docs/llvm
-PROJ_etcdir     := @prefix@/etc/llvm
-PROJ_includedir := @prefix@/include
-PROJ_infodir    := @prefix@/info
-PROJ_mandir     := @prefix@/man
+prefix          := @prefix@
+PROJ_prefix     := $(prefix)
 PROJ_VERSION    := $(LLVMVersion)
 else
 ifndef PROJ_SRC_ROOT
@@ -74,20 +67,24 @@ ifndef LLVM_OBJ_ROOT
 $(error Projects must define LLVM_OBJ_ROOT)
 endif
 PROJ_SRC_DIR := $(shell cd $(PROJ_SRC_ROOT)/$(patsubst $(PROJ_OBJ_ROOT)%,%,$(PROJ_OBJ_DIR)); $(PWD))
-PROJ_prefix     := $(PROJ_INSTALL_ROOT)
-PROJ_bindir     := $(PROJ_INSTALL_ROOT)/bin
-PROJ_libdir     := $(PROJ_INSTALL_ROOT)/lib
-PROJ_datadir    := $(PROJ_INSTALL_ROOT)/share
-PROJ_docsdir    := $(PROJ_INSTALL_ROOT)/docs/llvm
-PROJ_etcdir     := $(PROJ_INSTALL_ROOT)/etc/llvm
-PROJ_includedir := $(PROJ_INSTALL_ROOT)/include
-PROJ_infodir    := $(PROJ_INSTALL_ROOT)/info
-PROJ_mandir     := $(PROJ_INSTALL_ROOT)/man
+prefix          := $(PROJ_INSTALL_ROOT)
+PROJ_prefix     := $(prefix)
 ifndef PROJ_VERSION
 PROJ_VERSION := 1.0
 endif
 endif
 
+LLVMMAKE := $(LLVM_SRC_ROOT)/make
+
+PROJ_bindir     := $(DESTDIR)$(PROJ_prefix)/bin
+PROJ_libdir     := $(DESTDIR)$(PROJ_prefix)/lib
+PROJ_datadir    := $(DESTDIR)$(PROJ_prefix)/share
+PROJ_docsdir    := $(DESTDIR)$(PROJ_prefix)/docs/llvm
+PROJ_etcdir     := $(DESTDIR)$(PROJ_prefix)/etc/llvm
+PROJ_includedir := $(DESTDIR)$(PROJ_prefix)/include
+PROJ_infodir    := $(DESTDIR)$(PROJ_prefix)/info
+PROJ_mandir     := $(DESTDIR)$(PROJ_prefix)/man
+
 # Determine if we're on a unix type operating system
 LLVM_ON_UNIX:=@LLVM_ON_UNIX@
 LLVM_ON_WIN32:=@LLVM_ON_WIN32@
@@ -181,6 +178,9 @@ else
 LLVMGCCARCH := @target@/@LLVMGCC_VERSION@
 endif
 
+# Determine the path where the library executables are
+LLVMGCCLIBEXEC := @LLVMGCCLIBEXEC@
+
 # Full pathnames of LLVM C/C++ front-end 'cc1' and 'cc1plus' binaries:
 LLVMGCC  := @LLVMGCC@
 LLVMGXX  := @LLVMGXX@
@@ -223,6 +223,9 @@ ENABLE_DOXYGEN = @ENABLE_DOXYGEN@
 # Do we want to enable threads?
 ENABLE_THREADS := @ENABLE_THREADS@
 
+# Do we want to build with position independent code?
+ENABLE_PIC := @ENABLE_PIC@
+
 # This option tells the Makefiles to produce verbose output.
 # It essentially prints the commands that make is executing
 #VERBOSE = 1