Author: bugman Date: Thu Apr 19 00:21:06 2012 New Revision: 15784 URL: http://svn.gna.org/viewcvs/relax?rev=15784&view=rev Log: Reverted r15781, as this is no longer required. The command used was: $ svn merge -r15781:r15780 . ..... r15781 | bugman | 2012-04-18 18:14:16 +0200 (Wed, 18 Apr 2012) | 6 lines Changed paths: M /1.3/setup.py Shifted the build and dist directories out of the relax base directory. This is for the Mac OS X application building, and is to prevent the 'dist' directory from being recursively copied into itself. This seems to be a recently introduced bug. ..... Modified: 1.3/setup.py Modified: 1.3/setup.py URL: http://svn.gna.org/viewcvs/relax/1.3/setup.py?rev=15784&r1=15783&r2=15784&view=diff ============================================================================== --- 1.3/setup.py (original) +++ 1.3/setup.py Thu Apr 19 00:21:06 2012 @@ -230,9 +230,7 @@ self.OPTIONS['py2app'] = { 'argv_emulation': False, 'iconfile': status.install_path + sep + 'graphics' + sep + 'ulysses_shadowless_trans_128x128.icns', - 'bdist_base': "../build/bld", - 'dist_dir': "../build/dist", - 'packages': ['wx', 'numpy', 'scipy'], + 'packages': 'wx', 'site_packages': True, 'includes': self.get_includes(), 'excludes': ['build', 'dist'],