Changes in directory llvm:
Makefile.config.in updated: 1.73 -> 1.74 --- Log message: For PR739: http://llvm.org/PR739 : Support overriding the prefix and DESTDIR variables from the make command line. This makes the makefile system a little more GNU compliant and the feature makes it easier for distribution builders to re-target the install location of LLVM. --- Diffs of the changes: (+13 -19) Makefile.config.in | 32 +++++++++++++------------------- 1 files changed, 13 insertions(+), 19 deletions(-) Index: llvm/Makefile.config.in diff -u llvm/Makefile.config.in:1.73 llvm/Makefile.config.in:1.74 --- llvm/Makefile.config.in:1.73 Thu Dec 21 16:55:41 2006 +++ llvm/Makefile.config.in Wed Jan 17 14:24:45 2007 @@ -47,16 +47,8 @@ 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)) -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 +prefix := @prefix@ +PROJ_prefix := $(prefix) PROJ_VERSION := $(LLVMVersion) else ifndef PROJ_SRC_ROOT @@ -75,20 +67,22 @@ $(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 +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:[EMAIL PROTECTED]@ LLVM_ON_WIN32:[EMAIL PROTECTED]@ _______________________________________________ llvm-commits mailing list llvm-commits@cs.uiuc.edu http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
