[llvm-commits] [llvm] r146849 - in /llvm/trunk: CMakeLists.txt Makefile.config.in autoconf/configure.ac

[Eli Friedman]

On Sun, Dec 18, 2011 at 10:50 AM, Dylan Noblesmith
<nobled at dreamwidth.org> wrote:
> Author: nobled
> Date: Sun Dec 18 12:50:16 2011
> New Revision: 146849
>
> URL: http://llvm.org/viewvc/llvm-project?rev=146849&view=rev
> Log:
> 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-]
>
>
> Modified:
>    llvm/trunk/CMakeLists.txt
>    llvm/trunk/Makefile.config.in
>    llvm/trunk/autoconf/configure.ac

It looks like you never committed a regenerated version of configure?

-Eli

> Modified: llvm/trunk/CMakeLists.txt
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/CMakeLists.txt?rev=146849&r1=146848&r2=146849&view=diff
> ==============================================================================
> --- llvm/trunk/CMakeLists.txt (original)
> +++ llvm/trunk/CMakeLists.txt Sun Dec 18 12:50:16 2011
> @@ -23,9 +23,9 @@
>   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 at 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
>
> Modified: llvm/trunk/Makefile.config.in
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/Makefile.config.in?rev=146849&r1=146848&r2=146849&view=diff
> ==============================================================================
> --- llvm/trunk/Makefile.config.in (original)
> +++ llvm/trunk/Makefile.config.in Sun Dec 18 12:50:16 2011
> @@ -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 @@
>
>  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)
>
> Modified: llvm/trunk/autoconf/configure.ac
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/autoconf/configure.ac?rev=146849&r1=146848&r2=146849&view=diff
> ==============================================================================
> --- llvm/trunk/autoconf/configure.ac (original)
> +++ llvm/trunk/autoconf/configure.ac Sun Dec 18 12:50:16 2011
> @@ -30,8 +30,8 @@
>  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 at 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.
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits