Merged revisions 6621-6622 via svnmerge from

jdh2358 · jdh2358 · commit 117d1bcd6789 · 2008-12-15T20:48:34.000Z
https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/v0_98_5_maint ........ r6621 | jdh2358 | 2008-12-15 12:19:01 -0800 (Mon, 15 Dec 2008) | 1 line hack to prevent distutils from linking our files ........ r6622 | jdh2358 | 2008-12-15 12:45:20 -0800 (Mon, 15 Dec 2008) | 1 line hack to prevent distutils from creating links in our sdist ........ svn path=/trunk/matplotlib/; revision=6624
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,7 +1,7 @@
 include CHANGELOG KNOWN_BUGS INSTALL
 include INTERACTIVE TODO
 include Makefile  MANIFEST.in MANIFEST
-include matplotlibrc.template matplotlibrc setup.cfg.template
+include matplotlibrc.template setup.cfg.template
 include __init__.py setupext.py setup.py setupegg.py
 include examples/data/*
 include lib/mpl_toolkits
diff --git a/setup.py b/setup.py
@@ -6,6 +6,11 @@
 The matplotlib build options can be modified with a setup.cfg file. See
 setup.cfg.template for more information.
 """
+# distutils is breaking our sdists for files in symlinked dirs.
+# distutils will copy if os.link is not available, so this is a hack
+# to force copying
+import os
+del os.link
 
 # This dict will be updated as we try to select the best option during
 # the build process. However, values in setup.cfg will be used, if
