Don't mix install and build directories in smpicc.

Build directories are already given on command line by cmake.
Ensure that install directories come last in the list so that the correct
directories are used at build time for includes and libraries.

diff --git a/src/smpi/smpicc.in b/src/smpi/smpicc.in
index 7a77cba..a1d1de1 100755 (executable)
--- a/src/smpi/smpicc.in
+++ b/src/smpi/smpicc.in
@@ -3,8 +3,7 @@
 CC=@CMAKE_C_COMPILER@
 CFLAGS="-O2 -Dmain=smpi_simulated_main"
 
-#FIXME: probably only want the last two pairs after 'make install'
-INCLUDEARGS="-I@top_srcdir@/include -I@top_srcdir@/include/smpi -I@includedir@ -I@includedir@/smpi"
+INCLUDEARGS="-I@includedir@ -I@includedir@/smpi"
 CMAKE_LINKARGS="-L@CMAKE_LINKARGS@"
 LINKARGS="-lsimgrid -lsmpi -lm"
 
@@ -30,7 +29,7 @@ while [ -n "$1" ]; do
   esac
 done
 
-CMDLINE="${CC} ${INCLUDEARGS} ${CFLAGS} ${CMDLINE} ${CMAKE_LINKARGS} ${LINKARGS}"
+CMDLINE="${CC} ${CFLAGS} ${CMDLINE} ${INCLUDEARGS} ${CMAKE_LINKARGS} ${LINKARGS}"
 
 #echo "${CMDLINE}"
 ${CMDLINE}