diff options
| -rw-r--r-- | autoconf/configure.ac | 7 | ||||
| -rwxr-xr-x | configure | 10 |
2 files changed, 11 insertions, 6 deletions
diff --git a/autoconf/configure.ac b/autoconf/configure.ac index 96bb990049..0691f1fd4d 100644 --- a/autoconf/configure.ac +++ b/autoconf/configure.ac @@ -1574,8 +1574,11 @@ if test "${clang_src_root}" = ""; then clang_src_root="$srcdir/tools/clang" fi if test -f ${clang_src_root}/README.txt; then - AC_CONFIG_HEADERS([${clang_src_root}/include/clang/Config/config.h]) - AC_CONFIG_FILES([${clang_src_root}/docs/doxygen.cfg]) + dnl Use variables to stay under 80 columns. + configh="include/clang/Config/config.h" + doxy="docs/doxygen.cfg" + AC_CONFIG_HEADERS([tools/clang/${configh}:${clang_src_root}/${configh}.in]) + AC_CONFIG_FILES([tools/clang/${doxy}:${clang_src_root}/${doxy}.in]) fi dnl OCaml findlib META file @@ -21055,9 +21055,11 @@ if test "${clang_src_root}" = ""; then clang_src_root="$srcdir/tools/clang" fi if test -f ${clang_src_root}/README.txt; then - ac_config_headers="$ac_config_headers ${clang_src_root}/include/clang/Config/config.h" + configh="include/clang/Config/config.h" + doxy="docs/doxygen.cfg" + ac_config_headers="$ac_config_headers tools/clang/${configh}:${clang_src_root}/${configh}.in" - ac_config_files="$ac_config_files ${clang_src_root}/docs/doxygen.cfg" + ac_config_files="$ac_config_files tools/clang/${doxy}:${clang_src_root}/${doxy}.in" fi @@ -21679,8 +21681,8 @@ do "Makefile.config") CONFIG_FILES="$CONFIG_FILES Makefile.config" ;; "llvm.spec") CONFIG_FILES="$CONFIG_FILES llvm.spec" ;; "docs/doxygen.cfg") CONFIG_FILES="$CONFIG_FILES docs/doxygen.cfg" ;; - "${clang_src_root}/include/clang/Config/config.h") CONFIG_HEADERS="$CONFIG_HEADERS ${clang_src_root}/include/clang/Config/config.h" ;; - "${clang_src_root}/docs/doxygen.cfg") CONFIG_FILES="$CONFIG_FILES ${clang_src_root}/docs/doxygen.cfg" ;; + "tools/clang/${configh}") CONFIG_HEADERS="$CONFIG_HEADERS tools/clang/${configh}:${clang_src_root}/${configh}.in" ;; + "tools/clang/${doxy}") CONFIG_FILES="$CONFIG_FILES tools/clang/${doxy}:${clang_src_root}/${doxy}.in" ;; "bindings/ocaml/llvm/META.llvm") CONFIG_FILES="$CONFIG_FILES bindings/ocaml/llvm/META.llvm" ;; "setup") CONFIG_COMMANDS="$CONFIG_COMMANDS setup" ;; "Makefile") CONFIG_COMMANDS="$CONFIG_COMMANDS Makefile" ;; |