Merge remote-tracking branch 'lammps-ro/master' into lammps-icms

# Conflicts:
#	doc/Manual.html
#	doc/Manual.txt
#	python/install.py
#	python/lammps.py
#	src/read_restart.cpp
#	src/write_restart.cpp

python/install.py

@@ -4,7 +4,8 @@
 
 instructions = """
 Syntax: python install.py [-h] [pydir]
-        pydir = target dir for lammps.py and liblammps.so, default = Python site-packages dir
+        pydir = target dir for lammps.py and liblammps.so
+                default = Python site-packages dir
 """
 
 import sys,os,commands

python/lammps.py

@@ -16,12 +16,13 @@
 import sys,traceback,types
 from ctypes import *
 from os.path import dirname,abspath,join
+from inspect import getsourcefile
 
 class lammps:
   def __init__(self,name="",cmdargs=None,ptr=None):
 
     # determine module location
-    modpath = dirname(abspath(__file__))
+    modpath = dirname(abspath(getsourcefile(lambda:0)))
 
     # load liblammps.so by default
     # if name = "g++", load liblammps_g++.so