Skip to content

Commit

Permalink
Merge pull request #144 from andrewjpage/master
Browse files Browse the repository at this point in the history
Manually merge Aidan Delaneys pull request
  • Loading branch information
andrewjpage committed May 18, 2015
2 parents bffe70c + cf0d8a7 commit 9a5e985
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions INSTALL.md
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,7 @@ If you do not have permission to install the software as root and instead want t
$ wget https://bootstrap.pypa.io/ez_setup.py -O - | python - --user
$ ~/.local/bin/easy_install -U --user biopython
$ ~/.local/bin/easy_install -U --user dendropy
$ autoreconf -i
$ ./configure --prefix=~/.local
$ make
$ make install
Expand Down
2 changes: 1 addition & 1 deletion install-userspace.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#

py_pkgs=( "biopython" "dendropy" )
deb_urls=( "http://uk.archive.ubuntu.com/ubuntu/pool/universe/r/raxml/raxml_7.2.8-2_amd64.deb" "https://launchpad.net/~ap13/+archive/ubuntu/gubbins/+files/fastml2_2.3~trusty1_amd64.deb" "https://launchpad.net/~ap13/+archive/ubuntu/gubbins/+files/gubbins_1.1.1~trusty1_amd64.deb" )
deb_urls=( "http://uk.archive.ubuntu.com/ubuntu/pool/universe/r/raxml/raxml_7.2.8-2_amd64.deb" "https://launchpad.net/~ap13/+archive/ubuntu/gubbins/+files/fastml2_2.3~trusty1_amd64.deb" "https://launchpad.net/~ap13/+archive/ubuntu/gubbins/+files/gubbins_1.3.3~trusty1_amd64.deb" )

function check_platform {
# Ubuntu 14.04
Expand Down

0 comments on commit 9a5e985

Please sign in to comment.