[llvm-commits] CVS: llvm/Makefile.config.in

[Reid Spencer]

Changes in directory llvm:

Makefile.config.in updated: 1.69 -> 1.70
---
Log message:

For PR739: http://llvm.org/PR739 :
Define a DESTDIR variable and use it to define the various install 
locations. This allows DESTDIR to be overridden on the command line.


---
Diffs of the changes:  (+10 -9)

 Makefile.config.in |   19 ++++++++++---------
 1 files changed, 10 insertions(+), 9 deletions(-)


Index: llvm/Makefile.config.in
diff -u llvm/Makefile.config.in:1.69 llvm/Makefile.config.in:1.70
--- llvm/Makefile.config.in:1.69	Thu Nov 30 18:37:14 2006
+++ llvm/Makefile.config.in	Sat Dec  9 22:09:19 2006
@@ -47,15 +47,16 @@
 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
+DESTDIR         := @prefix@
+PROJ_prefix     := $(DESTDIR)
+PROJ_bindir     := $(DESTDIR)bin
+PROJ_libdir     := $(DESTDIR)lib
+PROJ_datadir    := $(DESTDIR)share
+PROJ_docsdir    := $(DESTDIR)docs/llvm
+PROJ_etcdir     := $(DESTDIR)etc/llvm
+PROJ_includedir := $(DESTDIR)include
+PROJ_infodir    := $(DESTDIR)info
+PROJ_mandir     := $(DESTDIR)man
 PROJ_VERSION    := $(LLVMVersion)
 else
 ifndef PROJ_SRC_ROOT