[llvm-commits] CVS: llvm/autoconf/m4/config_makefile.m4

[Reid Spencer]

Changes in directory llvm/autoconf/m4:

config_makefile.m4 updated: 1.1 -> 1.2
---
Log message:

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.


---
Diffs of the changes:  (+3 -1)

 config_makefile.m4 |    4 +++-
 1 files changed, 3 insertions(+), 1 deletion(-)


Index: llvm/autoconf/m4/config_makefile.m4
diff -u llvm/autoconf/m4/config_makefile.m4:1.1 llvm/autoconf/m4/config_makefile.m4:1.2
--- llvm/autoconf/m4/config_makefile.m4:1.1	Tue Sep  7 01:56:14 2004
+++ llvm/autoconf/m4/config_makefile.m4	Thu Feb 24 12:28:20 2005
@@ -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])
 ])