summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDylan Noblesmith <nobled@dreamwidth.org>2011-12-18 18:50:16 +0000
committerDylan Noblesmith <nobled@dreamwidth.org>2011-12-18 18:50:16 +0000
commit7fe0e03fb068406b9a67930c278aff661ef271e8 (patch)
tree630245d95ce06c4962c0be29341a99429a8df9a0
parent4c1ea552c54eefceeb7489a794a6d18b01c29900 (diff)
downloadllvm-7fe0e03fb068406b9a67930c278aff661ef271e8.tar.gz
llvm-7fe0e03fb068406b9a67930c278aff661ef271e8.tar.bz2
llvm-7fe0e03fb068406b9a67930c278aff661ef271e8.tar.xz
capitalize project name, reference bugzilla
And fix the double-[]. It was including the [] as part of the project name somehow, resulting in PACKAGE_TARNAME "-llvm-" and a strange docdir default: ./configure --help | grep docdir --docdir=DIR documentation root [DATAROOTDIR/doc/-llvm-] git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@146849 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--CMakeLists.txt4
-rw-r--r--Makefile.config.in4
-rw-r--r--autoconf/configure.ac4
3 files changed, 6 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index dc66e3e517..13e358a461 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -23,9 +23,9 @@ if( LLVM_APPEND_VC_REV )
add_version_info_from_vcs(PACKAGE_VERSION)
endif()
-set(PACKAGE_NAME llvm)
+set(PACKAGE_NAME LLVM)
set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}")
-set(PACKAGE_BUGREPORT "llvmbugs@cs.uiuc.edu")
+set(PACKAGE_BUGREPORT "http://llvm.org/bugs/")
# Sanity check our source directory to make sure that we are not trying to
# generate an in-tree build (unless on MSVC_IDE, where it is ok), and to make
diff --git a/Makefile.config.in b/Makefile.config.in
index 6422559574..b565bb44f7 100644
--- a/Makefile.config.in
+++ b/Makefile.config.in
@@ -13,7 +13,7 @@
#===------------------------------------------------------------------------===#
# Define LLVM specific info and directories based on the autoconf variables
-LLVMPackageName := @PACKAGE_NAME@
+LLVMPackageName := @PACKAGE_TARNAME@
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@
-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)
diff --git a/autoconf/configure.ac b/autoconf/configure.ac
index d7fc95bdc8..d90f99fe4e 100644
--- a/autoconf/configure.ac
+++ b/autoconf/configure.ac
@@ -30,8 +30,8 @@ dnl=== SECTION 1: Initialization & Setup
dnl===
dnl===-----------------------------------------------------------------------===
dnl Initialize autoconf and define the package name, version number and
-dnl email address for reporting bugs.
-AC_INIT([[llvm]],[[3.1svn]],[llvmbugs@cs.uiuc.edu])
+dnl address for reporting bugs.
+AC_INIT([LLVM],[3.1svn],[http://llvm.org/bugs/])
dnl Provide a copyright substitution and ensure the copyright notice is included
dnl in the output of --version option of the generated configure script.