From 3e908537397e4dc5910fde07fe3a0b0f5abf4590 Mon Sep 17 00:00:00 2001
From: sjplimp <sjplimp@f3b2605a-c512-4ea7-a41b-209d697bcdaa>
Date: Fri, 7 Oct 2011 23:40:08 +0000
Subject: [PATCH] git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7045
 f3b2605a-c512-4ea7-a41b-209d697bcdaa

---
 src/MAKE/Makefile.g++    | 8 ++++----
 src/MAKE/Makefile.serial | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/MAKE/Makefile.g++ b/src/MAKE/Makefile.g++
index c9480cd026..62f82e372a 100755
--- a/src/MAKE/Makefile.g++
+++ b/src/MAKE/Makefile.g++
@@ -6,10 +6,10 @@ SHELL = /bin/sh
 # compiler/linker settings
 # specify flags and libraries needed for your compiler
 
-CC =		g++4
+CC =		g++
 CCFLAGS =	-g -O # -Wunused
 DEPFLAGS =	-M
-LINK =		g++4
+LINK =		g++
 LINKFLAGS =	-g -O
 LIB =           
 ARCHIVE =	ar
@@ -35,7 +35,7 @@ LMP_INC =	-DLAMMPS_GZIP -DLAMMPS_JPEG
 
 MPI_INC =       -DMPICH_SKIP_MPICXX
 MPI_PATH = 
-MPI_LIB =	-lmpich -lpthread
+MPI_LIB =	-lmpich -lmpl -lpthread
 
 # FFT library, OPTIONAL
 # see discussion in doc/Section_start.html#2_2 (step 6)
@@ -57,7 +57,7 @@ FFT_LIB =	-lfftw
 
 JPG_INC =       
 JPG_PATH = 	
-JPG_LIB =	/usr/local/lib/libjpeg.a
+JPG_LIB =	-ljpeg
 
 # ---------------------------------------------------------------------
 # build rules and dependencies
diff --git a/src/MAKE/Makefile.serial b/src/MAKE/Makefile.serial
index cc4480d79b..8849b18432 100755
--- a/src/MAKE/Makefile.serial
+++ b/src/MAKE/Makefile.serial
@@ -7,10 +7,10 @@ SHELL = /bin/sh
 # generally no need to edit this section
 # unless additional compiler/linker flags or libraries needed for your machine
 
-CC =		g++4
+CC =		g++
 CCFLAGS =	-O
 DEPFLAGS =	-M
-LINK =		g++4
+LINK =		g++
 LINKFLAGS =	-O
 LIB =           
 ARCHIVE =	ar