1.1 --- a/moinsetup.py	Mon Oct 10 01:10:50 2011 +0200
     1.2 +++ b/moinsetup.py	Sat Oct 15 22:36:26 2011 +0200
     1.3 @@ -499,18 +499,19 @@
     1.4  
     1.5          "Return the MoinMoin version."
     1.6  
     1.7 -        if self.moin_distribution:
     1.8 -            this_dir = os.getcwd()
     1.9 -            try:
    1.10 -                chdir(self.moin_distribution)
    1.11 -                version = self.get_moin_version_from_package_info() or \
    1.12 -                    self.get_moin_version_from_import()
    1.13 -                if version:
    1.14 -                    return version
    1.15 +        this_dir = os.getcwd()
    1.16  
    1.17 -            finally:
    1.18 -                chdir(this_dir)
    1.19 +        for dir in [self.moin_distribution, self.prefix_site_packages]:
    1.20 +            if dir:
    1.21 +                try:
    1.22 +                    chdir(dir)
    1.23 +                    version = self.get_moin_version_from_package_info() or \
    1.24 +                        self.get_moin_version_from_import()
    1.25 +                    if version:
    1.26 +                        return version
    1.27  
    1.28 +                finally:
    1.29 +                    chdir(this_dir)
    1.30          else:
    1.31              return self.get_moin_version_from_import()
    1.32