diff options
author | Kaz Kylheku <kaz@kylheku.com> | 2012-04-20 18:29:27 -0700 |
---|---|---|
committer | Kaz Kylheku <kaz@kylheku.com> | 2012-04-20 18:29:27 -0700 |
commit | 21a927997f92fd67e3b4bd07a9264fdd4fa38df9 (patch) | |
tree | 8a44c8e5729efe22dc20d273c616c3fb556eaedc /configure | |
parent | 6631b687b9761613aee2c07b4ce0c310ff718a70 (diff) | |
download | txr-21a927997f92fd67e3b4bd07a9264fdd4fa38df9.tar.gz txr-21a927997f92fd67e3b4bd07a9264fdd4fa38df9.tar.bz2 txr-21a927997f92fd67e3b4bd07a9264fdd4fa38df9.zip |
Fixes for configuring and building in a separate directory.
* configure: MPI is now extracted and patched in the build directory,
not in the source directory.
* Makefile (CFLAGS): Refer to mpi headers relative to current
directory, not $(top_srcdir).
(repatch): Run MPI repatching steps in correct directory.
(clean): Remove extracted MPI from build directory.
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 11 |
1 files changed, 5 insertions, 6 deletions
@@ -1288,20 +1288,19 @@ apply_patches() printf "Extracting MPI ... " -if [ -e $top_srcdir/mpi-${mpi_version} ] ; then +if [ -e mpi-${mpi_version} ] ; then printf "already extracted\n" else - tar -C $top_srcdir -xzf $top_srcdir/mpi-${mpi_version}.tar.gz + tar -xzf $top_srcdir/mpi-${mpi_version}.tar.gz printf "\n" printf "Symlinking MPI patches ...\n" - ln -sf ../mpi-patches \ - $top_srcdir/mpi-${mpi_version}/patches + ln -sf $top_srcdir/mpi-patches mpi-${mpi_version}/patches printf "Applying MPI patches ...\n" if [ -n "$have_quilt" ] ; then - ( cd $top_srcdir/mpi-${mpi_version}/patches ; + ( cd mpi-${mpi_version}/patches ; if [ -e series ] ; then quilt push -a ; else echo "no patches" ; fi ) else - ( cd $top_srcdir/mpi-${mpi_version} ; + ( cd mpi-${mpi_version} ; apply_patches ) fi fi |