From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Thu, 27 Apr 2017 13:12:46 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/stable/2.0'
X-Git-Tag: reindent-master-before~211
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=d8a055e0f254c9c6d894179b494712654dfa3033;p=matthieu%2Ffrr.git

Merge remote-tracking branch 'origin/stable/2.0'
---

d8a055e0f254c9c6d894179b494712654dfa3033
diff --cc doc/Building_FRR_on_Ubuntu1604.md
index 70a8159cc1,7848ff68ab..327b7d68a0
--- a/doc/Building_FRR_on_Ubuntu1604.md
+++ b/doc/Building_FRR_on_Ubuntu1604.md
@@@ -36,8 -36,10 +36,9 @@@ an example.
  
      git clone https://github.com/frrouting/frr.git frr
      cd frr
 -    git checkout stable/2.0
      ./bootstrap.sh
      ./configure \
+         --prefix=/usr \
          --enable-exampledir=/usr/share/doc/frr/examples/ \
          --localstatedir=/var/run/frr \
          --sbindir=/usr/lib/frr \