diff --git a/src/MAKE/Makefile.g++ b/src/MAKE/Makefile.g++
index b82fb3db59..8a29a96b9b 100755
--- a/src/MAKE/Makefile.g++
+++ b/src/MAKE/Makefile.g++
@@ -8,7 +8,7 @@ SHELL = /bin/sh
 include		Makefile.package
 
 CC =		g++
-CCFLAGS =	-g $(PKGINC) -DFFT_FFTW -DLAMMPS_GZIP -DMPICH_IGNORE_CXX_SEEK
+CCFLAGS =	-g -DFFT_FFTW -DLAMMPS_GZIP -DMPICH_IGNORE_CXX_SEEK $(PKGINC)
 DEPFLAGS =	-M
 LINK =		g++
 LINKFORT =	-L/opt/intel/fce/10.0.023/lib
diff --git a/src/MEAM/Install.csh b/src/MEAM/Install.csh
index 348181756f..0e30346b6f 100644
--- a/src/MEAM/Install.csh
+++ b/src/MEAM/Install.csh
@@ -3,19 +3,21 @@
 
 if ($1 == 1) then
 
+  sed -i 's/\S*meam //' ../Makefile.package
+  sed -i 's|^PKGINC =\s*|&-I../../lib/meam |' ../Makefile.package
+  sed -i 's|^PKGPATH =\s*|&-L../../lib/meam |' ../Makefile.package
+  sed -i 's|^PKGLIB =\s*|&-lmeam |' ../Makefile.package
+
   cp style_meam.h ..
 
   cp pair_meam.cpp ..
 
   cp pair_meam.h ..
 
-  sed -i 's/\S*meam //' ../Makefile.package
-  sed -i 's|^PKGINC =\s*|&-I../../lib/meam |' ../Makefile.package
-  sed -i 's|^PKGPATH =\s*|&-L../../lib/meam |' ../Makefile.package
-  sed -i 's|^PKGLIB =\s*|&-lmeam |' ../Makefile.package
-
 else if ($1 == 0) then
 
+  sed -i 's/\S*meam //' ../Makefile.package
+
   rm ../style_meam.h
   touch ../style_meam.h
 
@@ -23,6 +25,4 @@ else if ($1 == 0) then
 
   rm ../pair_meam.h
 
-  sed -i 's/\S*meam //' ../Makefile.package
-
 endif
diff --git a/src/POEMS/Install.csh b/src/POEMS/Install.csh
index 78fb0131d7..65398f1b5f 100644
--- a/src/POEMS/Install.csh
+++ b/src/POEMS/Install.csh
@@ -3,19 +3,21 @@
 
 if ($1 == 1) then
 
+  sed -i 's/\S*poems //' ../Makefile.package
+  sed -i 's|^PKGINC =\s*|&-I../../lib/poems |' ../Makefile.package
+  sed -i 's|^PKGPATH =\s*|&-L../../lib/poems |' ../Makefile.package
+  sed -i 's|^PKGLIB =\s*|&-lpoems |' ../Makefile.package
+
   cp style_poems.h ..
 
   cp fix_poems.cpp ..
 
   cp fix_poems.h ..
 
-  sed -i 's/\S*poems //' ../Makefile.package
-  sed -i 's|^PKGINC =\s*|&-I../../lib/poems |' ../Makefile.package
-  sed -i 's|^PKGPATH =\s*|&-L../../lib/poems |' ../Makefile.package
-  sed -i 's|^PKGLIB =\s*|&-lpoems |' ../Makefile.package
-
 else if ($1 == 0) then
 
+  sed -i 's/\S*poems //' ../Makefile.package
+
   rm ../style_poems.h
   touch ../style_poems.h
 
@@ -23,6 +25,4 @@ else if ($1 == 0) then
 
   rm ../fix_poems.h
 
-  sed -i 's/\S*poems //' ../Makefile.package
-
 endif
diff --git a/src/REAX/Install.csh b/src/REAX/Install.csh
index c33b8bf482..5b008a8e42 100644
--- a/src/REAX/Install.csh
+++ b/src/REAX/Install.csh
@@ -3,6 +3,11 @@
 
 if ($1 == 1) then
 
+  sed -i 's/\S*reax //' ../Makefile.package
+  sed -i 's|^PKGINC =\s*|&-I../../lib/reax |' ../Makefile.package
+  sed -i 's|^PKGPATH =\s*|&-L../../lib/reax |' ../Makefile.package
+  sed -i 's|^PKGLIB =\s*|&-lreax |' ../Makefile.package
+
   cp style_reax.h ..
 
   cp pair_reax.cpp ..
@@ -13,13 +18,10 @@ if ($1 == 1) then
   cp fix_reax_bonds.h ..
   cp fix_reax_bonds.cpp ..
 
-  sed -i 's/\S*reax //' ../Makefile.package
-  sed -i 's|^PKGINC =\s*|&-I../../lib/reax |' ../Makefile.package
-  sed -i 's|^PKGPATH =\s*|&-L../../lib/reax |' ../Makefile.package
-  sed -i 's|^PKGLIB =\s*|&-lreax |' ../Makefile.package
-
 else if ($1 == 0) then
 
+  sed -i 's/\S*reax //' ../Makefile.package
+
   rm ../style_reax.h
   touch ../style_reax.h
 
@@ -31,6 +33,4 @@ else if ($1 == 0) then
   rm ../fix_reax_bonds.h
   rm ../fix_reax_bonds.cpp
 
-  sed -i 's/\S*reax //' ../Makefile.package
-
 endif