From: John L. <mov...@us...> - 2002-12-21 21:42:00
|
Update of /cvsroot/oprofile/oprofile In directory sc8-pr-cvs1:/tmp/cvs-serv8744 Modified Files: .cvsignore ChangeLog configure.in Log Message: Remove the ln -s arch hack. Instead we set path with -I and use AC_SUBST. Also fix make uninstall Index: .cvsignore =================================================================== RCS file: /cvsroot/oprofile/oprofile/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- .cvsignore 9 Nov 2002 19:53:09 -0000 1.9 +++ .cvsignore 21 Dec 2002 21:41:54 -0000 1.10 @@ -1,4 +1,5 @@ missing +autom4te-* mkinstalldirs INSTALL depcomp Index: ChangeLog =================================================================== RCS file: /cvsroot/oprofile/oprofile/ChangeLog,v retrieving revision 1.749 retrieving revision 1.750 diff -u -d -r1.749 -r1.750 --- ChangeLog 21 Dec 2002 21:06:25 -0000 1.749 +++ ChangeLog 21 Dec 2002 21:41:54 -0000 1.750 @@ -1,5 +1,16 @@ 2002-12-21 John Levon <le...@mo...> + * module/Makefile.am: + * configure.in: remove the ln -s arch in favour of + using -I and AC_SUBST + + * module/ia64/arch.h: + * module/x86/arch.h: rename to op_arch.h + + * utils/Makefile.am: fix make uninstall + +2002-12-21 John Levon <le...@mo...> + * utils/Makefile.am: fix back-compat scripts install for 2.5 kernel Index: configure.in =================================================================== RCS file: /cvsroot/oprofile/oprofile/configure.in,v retrieving revision 1.129 retrieving revision 1.130 diff -u -d -r1.129 -r1.130 --- configure.in 17 Dec 2002 05:04:50 -0000 1.129 +++ configure.in 21 Dec 2002 21:41:54 -0000 1.130 @@ -160,7 +160,6 @@ AC_SUBST(BUILD_HAMMER) test "$arch" = "unknown" && AC_MSG_ERROR(Unsupported architecture) - (cd ${srcdir}/module/ && rm -f arch/ && ln -s $arch arch) dnl check to see if kernel verion appropriate for arch AC_MSG_CHECKING(arch/kernel version combination) @@ -180,11 +179,11 @@ AC_SUBST(KINC) MODINSTALLDIR=/lib/modules/$KVERS -else - # needed for clean build --with-kernel-support. Hack ! - (cd ${srcdir}/module/ && rm -f arch/ && ln -s x86 arch) fi +OPROFILE_MODULE_ARCH=$arch +AC_SUBST(OPROFILE_MODULE_ARCH) + AC_ARG_WITH(module-dir, [ --with-module-dir=dir Path to module installation directory], MODINSTALLDIR=$withval) AC_SUBST(MODINSTALLDIR) |