aboutsummaryrefslogtreecommitdiffstats
path: root/docs/source/siteadmin
diff options
context:
space:
mode:
authorChristopher Allan Webber <cwebber@dustycloud.org>2013-08-07 11:57:12 -0500
committerChristopher Allan Webber <cwebber@dustycloud.org>2013-08-07 11:57:12 -0500
commit24e6c34e880494f3e0cb2151db13ffcd128e1578 (patch)
tree6b59a3e1f245a181abffdff108ca9f05c177db4f /docs/source/siteadmin
parent31de493e4136f1c0c8e9d8f0b82c2914ea990c15 (diff)
parent99d79749c44f3cb37faf4152762f9847292b7c0a (diff)
downloadmediagoblin-24e6c34e880494f3e0cb2151db13ffcd128e1578.tar.lz
mediagoblin-24e6c34e880494f3e0cb2151db13ffcd128e1578.tar.xz
mediagoblin-24e6c34e880494f3e0cb2151db13ffcd128e1578.zip
Merge branch 'merge-pyconfigure'
Conflicts: docs/source/siteadmin/deploying.rst
Diffstat (limited to 'docs/source/siteadmin')
-rw-r--r--docs/source/siteadmin/deploying.rst15
1 files changed, 13 insertions, 2 deletions
diff --git a/docs/source/siteadmin/deploying.rst b/docs/source/siteadmin/deploying.rst
index 2f68912d..6123dc9e 100644
--- a/docs/source/siteadmin/deploying.rst
+++ b/docs/source/siteadmin/deploying.rst
@@ -203,12 +203,23 @@ Clone the MediaGoblin repository and set up the git submodules::
cd mediagoblin
git submodule init && git submodule update
-Set up the in-package virtualenv::
+Set up the in-package virtualenv via make::
- (virtualenv --system-site-packages . || virtualenv .) && ./bin/python setup.py develop
+ ./bootstrap.sh && ./configure && make
.. note::
+ Prefer not to use make, or want to use the "old way" of installing
+ MediaGoblin (maybe you know how to use virtualenv and python
+ packaging)? You still can! All that the above make script is doing
+ is installing an in-package virtualenv and running
+
+ ./bin/python setup.py develop
+
+.. ::
+
+ (NOTE: Is this still relevant?)
+
If you have problems here, consider trying to install virtualenv
with the ``--distribute`` or ``--no-site-packages`` options. If
your system's default Python is in the 3.x series you may need to