[44] | 1 | diff -Nur mpich2-1.0.7/Makefile.in mpich2-1.0.7.new/Makefile.in |
---|
| 2 | --- mpich2-1.0.7/Makefile.in 2008-04-04 15:03:17.000000000 -0700 |
---|
| 3 | +++ mpich2-1.0.7.new/Makefile.in 2008-06-22 11:14:25.000000000 -0700 |
---|
| 4 | @@ -185,6 +185,7 @@ |
---|
| 5 | if [ ! -d ${DESTDIR}${exec_prefix} ] ; then $(MKDIR_P) ${DESTDIR}${exec_prefix} ; fi |
---|
| 6 | if [ ! -d ${DESTDIR}${libdir} ] ; then $(MKDIR_P) ${DESTDIR}${libdir} ; fi |
---|
| 7 | ${MAKE} install-local |
---|
| 8 | + ${MAKE} install-examples |
---|
| 9 | $(INSTALL_DATA) src/include/mpi.h ${DESTDIR}${includedir}/mpi.h |
---|
| 10 | $(INSTALL_DATA) lib/lib${MPILIBNAME}.a ${DESTDIR}${libdir}/lib${MPILIBNAME}.a |
---|
| 11 | if [ ! -d ${DESTDIR}${docdir} ] ; then $(MKDIR_P) ${DESTDIR}${docdir} ; fi |
---|
| 12 | @@ -479,9 +480,9 @@ |
---|
| 13 | # documentation) |
---|
| 14 | install-examples: |
---|
| 15 | if [ ! -d ${DESTDIR}${exec_prefix}/examples ] ; then \ |
---|
| 16 | - $(MKDIR_P) ${DESTDIR}${exec_prefix}/examples ; \ |
---|
| 17 | + $(MKDIR_P) ${DESTDIR}${exec_prefix}/share/mpich2/examples ; \ |
---|
| 18 | fi |
---|
| 19 | - $(INSTALL_PROGRAM) examples/cpi ${DESTDIR}${exec_prefix}/examples/cpi |
---|
| 20 | + $(INSTALL_PROGRAM) examples/cpi ${DESTDIR}${exec_prefix}/share/mpich2/examples/cpi |
---|
| 21 | |
---|
| 22 | install-devdocs: |
---|
| 23 | (cd doc && $(MAKE) install-devdocs) |
---|
| 24 | diff -Nur mpich2-1.0.7/src/mpe2/Makefile.in mpich2-1.0.7.new/src/mpe2/Makefile.in |
---|
| 25 | --- mpich2-1.0.7/src/mpe2/Makefile.in 2008-03-12 17:43:05.000000000 -0700 |
---|
| 26 | +++ mpich2-1.0.7.new/src/mpe2/Makefile.in 2008-06-22 11:14:44.000000000 -0700 |
---|
| 27 | @@ -70,25 +70,25 @@ |
---|
| 28 | |
---|
| 29 | ######## Installing |
---|
| 30 | install: FORCE_TARGET |
---|
| 31 | - @if [ -n "$(PREFIX)" ] ; then \ |
---|
| 32 | - ./sbin/mpeinstall -prefix=$(PREFIX) -dmode="" ; \ |
---|
| 33 | + @if [ -n "$(prefix)" ] ; then \ |
---|
| 34 | + ./sbin/mpeinstall -prefix=$(prefix) -dmode="" ; \ |
---|
| 35 | else \ |
---|
| 36 | ./sbin/mpeinstall -dmode="" ; \ |
---|
| 37 | fi |
---|
| 38 | |
---|
| 39 | installcheck: |
---|
| 40 | - @if [ -n "$(PREFIX)" ] ; then \ |
---|
| 41 | - ./sbin/mpecheckinstall -prefix=$(PREFIX) ; \ |
---|
| 42 | + @if [ -n "$(prefix)" ] ; then \ |
---|
| 43 | + ./sbin/mpecheckinstall -prefix=$(prefix) ; \ |
---|
| 44 | else \ |
---|
| 45 | ./sbin/mpecheckinstall ; \ |
---|
| 46 | fi |
---|
| 47 | |
---|
| 48 | installcheck-all: |
---|
| 49 | - @if [ -n "$(PREFIX)" ] ; then \ |
---|
| 50 | + @if [ -n "$(prefix)" ] ; then \ |
---|
| 51 | if [ -n "$(MPERUN)" ] ; then \ |
---|
| 52 | - ./sbin/mpecheckinstall -prefix=$(PREFIX) -run="$(MPERUN)" ; \ |
---|
| 53 | + ./sbin/mpecheckinstall -prefix=$(prefix) -run="$(MPERUN)" ; \ |
---|
| 54 | else \ |
---|
| 55 | - ./sbin/mpecheckinstall -prefix=$(PREFIX) -run ; \ |
---|
| 56 | + ./sbin/mpecheckinstall -prefix=$(prefix) -run ; \ |
---|
| 57 | fi ; \ |
---|
| 58 | else \ |
---|
| 59 | if [ -n "$(MPERUN)" ] ; then \ |
---|
| 60 | diff -Nur mpich2-1.0.7/src/mpe2/src/slog2sdk/Makefile.in mpich2-1.0.7.new/src/mpe2/src/slog2sdk/Makefile.in |
---|
| 61 | --- mpich2-1.0.7/src/mpe2/src/slog2sdk/Makefile.in 2008-03-12 17:43:05.000000000 -0700 |
---|
| 62 | +++ mpich2-1.0.7.new/src/mpe2/src/slog2sdk/Makefile.in 2008-06-22 11:14:43.000000000 -0700 |
---|
| 63 | @@ -15,8 +15,8 @@ |
---|
| 64 | done |
---|
| 65 | |
---|
| 66 | install: |
---|
| 67 | - @if [ -n "$(PREFIX)" ] ; then \ |
---|
| 68 | - ./sbin/install-package -prefix=$(PREFIX) ; \ |
---|
| 69 | + @if [ -n "$(prefix)" ] ; then \ |
---|
| 70 | + ./sbin/install-package -prefix=$(prefix) ; \ |
---|
| 71 | else \ |
---|
| 72 | ./sbin/install-package ; \ |
---|
| 73 | fi |
---|
| 74 | diff -Nur mpich2-1.0.7/src/mpe2/src/slog2sdk/trace_rlog/Makefile.in mpich2-1.0.7.new/src/mpe2/src/slog2sdk/trace_rlog/Makefile.in |
---|
| 75 | --- mpich2-1.0.7/src/mpe2/src/slog2sdk/trace_rlog/Makefile.in 2008-03-12 17:43:05.000000000 -0700 |
---|
| 76 | +++ mpich2-1.0.7.new/src/mpe2/src/slog2sdk/trace_rlog/Makefile.in 2008-06-22 11:14:42.000000000 -0700 |
---|
| 77 | @@ -7,8 +7,8 @@ |
---|
| 78 | cd src && $(MAKE) |
---|
| 79 | |
---|
| 80 | install: |
---|
| 81 | - @if [ -n "$(PREFIX)" ] ; then \ |
---|
| 82 | - ./sbin/install-package -prefix=$(PREFIX) ; \ |
---|
| 83 | + @if [ -n "$(prefix)" ] ; then \ |
---|
| 84 | + ./sbin/install-package -prefix=$(prefix) ; \ |
---|
| 85 | else \ |
---|
| 86 | ./sbin/install-package ; \ |
---|
| 87 | fi |
---|
| 88 | diff -Nur mpich2-1.0.7/src/mpe2/src/slog2sdk/trace_sample/Makefile.in mpich2-1.0.7.new/src/mpe2/src/slog2sdk/trace_sample/Makefile.in |
---|
| 89 | --- mpich2-1.0.7/src/mpe2/src/slog2sdk/trace_sample/Makefile.in 2008-03-12 17:43:05.000000000 -0700 |
---|
| 90 | +++ mpich2-1.0.7.new/src/mpe2/src/slog2sdk/trace_sample/Makefile.in 2008-06-22 11:14:41.000000000 -0700 |
---|
| 91 | @@ -7,8 +7,8 @@ |
---|
| 92 | cd src && $(MAKE) |
---|
| 93 | |
---|
| 94 | install: |
---|
| 95 | - @if [ -n "$(PREFIX)" ] ; then \ |
---|
| 96 | - ./sbin/install-package -prefix=$(PREFIX) ; \ |
---|
| 97 | + @if [ -n "$(prefix)" ] ; then \ |
---|
| 98 | + ./sbin/install-package -prefix=$(prefix) ; \ |
---|
| 99 | else \ |
---|
| 100 | ./sbin/install-package ; \ |
---|
| 101 | fi |
---|
| 102 | diff -Nur mpich2-1.0.7/src/mpi/romio/Makefile.in mpich2-1.0.7.new/src/mpi/romio/Makefile.in |
---|
| 103 | --- mpich2-1.0.7/src/mpi/romio/Makefile.in 2008-03-10 15:38:31.000000000 -0700 |
---|
| 104 | +++ mpich2-1.0.7.new/src/mpi/romio/Makefile.in 2008-06-22 11:14:37.000000000 -0700 |
---|
| 105 | @@ -134,11 +134,11 @@ |
---|
| 106 | |
---|
| 107 | install: |
---|
| 108 | $(MAKE) clean |
---|
| 109 | - @./util/romioinstall -prefix=$(PREFIX) |
---|
| 110 | + @./util/romioinstall -prefix=$(prefix) |
---|
| 111 | |
---|
| 112 | # LAM added uninstall target |
---|
| 113 | uninstall: |
---|
| 114 | - @./util/romioinstall -prefix=$(PREFIX) -uninstall |
---|
| 115 | + @./util/romioinstall -prefix=$(prefix) -uninstall |
---|
| 116 | |
---|
| 117 | # FIXME: To avoid problems with noisy make programs, these should be accessed |
---|
| 118 | # through entries in localdefs . |
---|