This macro cannot assume that the location of install-sh and mkinstalldirs

is in ${srcdir}/autoconf because that is only true if the project is LLVM.
For other projects (e.g. sample), we don't want to have to distribute the
mkinstalldirs or install-sh programs because it opens a window of breakage
for projects. So, this change requires that the llvm_src variable be set
up via another AC_CONFIG_COMMANDS call. For LLVM this is done in the
configure.ac. For projects its done in the LLVM_CONFIG_PROJECT macro.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@20304 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/autoconf/m4/config_makefile.m4 b/autoconf/m4/config_makefile.m4
index e30f18762015cef013e5c3a6cb0573053b551c64..f21a25631edfea8fc377d49d78ab1fccf650514c 100644 (file)
--- a/autoconf/m4/config_makefile.m4
+++ b/autoconf/m4/config_makefile.m4
@@ -3,5 +3,7 @@
 # date.  This macro is unique to LLVM.
 #
 AC_DEFUN([AC_CONFIG_MAKEFILE],
-[AC_CONFIG_COMMANDS($1,${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/$1 $1,${srcdir}/autoconf/mkinstalldirs `dirname $1`)
+[AC_CONFIG_COMMANDS($1,
+  [${llvm_src}/autoconf/mkinstalldirs `dirname $1`
+   ${SHELL} ${llvm_src}/autoconf/install-sh -c ${srcdir}/$1 $1])
 ])