From a45fec573dc5c9c3bff0ff3235fbe436ef133b38 Mon Sep 17 00:00:00 2001 From: Pratik Yadav Date: Wed, 28 Mar 2018 15:41:51 +0530 Subject: [PATCH 1/2] install on Ubuntu --- README.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/README.md b/README.md index bf80071..a4626e4 100644 --- a/README.md +++ b/README.md @@ -39,6 +39,14 @@ The easiest way to install tippecanoe on OSX is with [Homebrew](http://brew.sh/) $ brew install tippecanoe ``` +on Ubuntu: +```js +$ git clone git@github.com:mapbox/tippecanoe.git +$ cd tippecanoe +$ make +$ make install +``` + Usage ----- From d5b0da3ae02a1a9920f624e6acb36d0d3861f147 Mon Sep 17 00:00:00 2001 From: Eric Fischer Date: Wed, 28 Mar 2018 12:23:36 -0700 Subject: [PATCH 2/2] Add link to Development section for compiler and prerequisite info --- README.md | 13 +++++++++---- man/tippecanoe.1 | 17 ++++++++++++++++- 2 files changed, 25 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index a4626e4..fdfd9dc 100644 --- a/README.md +++ b/README.md @@ -35,18 +35,23 @@ Installation The easiest way to install tippecanoe on OSX is with [Homebrew](http://brew.sh/): -```js +```sh $ brew install tippecanoe ``` -on Ubuntu: -```js +On Ubuntu it will usually be easiest to build from the source repository: + +```sh $ git clone git@github.com:mapbox/tippecanoe.git $ cd tippecanoe -$ make +$ make -j $ make install ``` +See [Development](#development) below for how to upgrade your +C++ compiler or install prerequisite packages if you get +compiler errors. + Usage ----- diff --git a/man/tippecanoe.1 b/man/tippecanoe.1 index 63e4abf..3dfb36c 100644 --- a/man/tippecanoe.1 +++ b/man/tippecanoe.1 @@ -6,7 +6,7 @@ like these \[la]MADE_WITH.md\[ra]\&. [Mapbox Tippecanoe](\[la]https://user-images.githubusercontent.com/1951835/36568734-ede27ec0-17df-11e8-8c22-ffaaebb8daf4.JPG\[ra]) .PP [Build Status](https://travis\-ci.org/mapbox/tippecanoe.svg) \[la]https://travis-ci.org/mapbox/tippecanoe\[ra] -[Coverage Status](https://coveralls.io/repos/mapbox/tippecanoe/badge.svg?branch=master&service=github) \[la]https://coveralls.io/github/mapbox/tippecanoe?branch=master\[ra] +[Coverage Status](https://codecov.io/gh/mapbox/tippecanoe/branch/master/graph/badge.svg) \[la]https://codecov.io/gh/mapbox/tippecanoe\[ra] .SH Intent .PP The goal of Tippecanoe is to enable making a scale\-independent view of your data, @@ -35,6 +35,21 @@ The easiest way to install tippecanoe on OSX is with Homebrew \[la]http://brew.s $ brew install tippecanoe .fi .RE +.PP +On Ubuntu it will usually be easiest to build from the source repository: +.PP +.RS +.nf +$ git clone git@github.com:mapbox/tippecanoe.git +$ cd tippecanoe +$ make \-j +$ make install +.fi +.RE +.PP +See Development \[la]#development\[ra] below for how to upgrade your +C++ compiler or install prerequisite packages if you get +compiler errors. .SH Usage .PP .RS