aboutsummaryrefslogtreecommitdiffstats
path: root/docs/source
diff options
context:
space:
mode:
authorAditi <aditi.iitr@gmail.com>2013-08-09 16:38:55 +0530
committerAditi <aditi.iitr@gmail.com>2013-08-09 16:38:55 +0530
commit18fd3a272b29820e2ad1ba00c7cbea0bdfb7bd0d (patch)
tree96ccfbab12fce17b20de16ecaa592f9d8645d5e1 /docs/source
parent97ce2563ed4fd4fa68a5d1e3db802e0d41d48a29 (diff)
parentd7ecae5a4e8030915295b5c520d78971aad0f828 (diff)
downloadmediagoblin-18fd3a272b29820e2ad1ba00c7cbea0bdfb7bd0d.tar.lz
mediagoblin-18fd3a272b29820e2ad1ba00c7cbea0bdfb7bd0d.tar.xz
mediagoblin-18fd3a272b29820e2ad1ba00c7cbea0bdfb7bd0d.zip
Merge branch 'master' of git://gitorious.org/mediagoblin/mediagoblin
Diffstat (limited to 'docs/source')
-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